Commit 1668b821 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

staging: lustre: remove l_file define

It's a "file" structure, so use it instead of trying to rename it.

Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: hpdd-discuss <hpdd-discuss@lists.01.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 178b6901
...@@ -43,12 +43,10 @@ ...@@ -43,12 +43,10 @@
#include "../lvfs.h" #include "../lvfs.h"
#define l_file file
#define l_filp_open filp_open #define l_filp_open filp_open
struct lvfs_run_ctxt; struct lvfs_run_ctxt;
struct l_file *l_dentry_open(struct lvfs_run_ctxt *, struct dentry *, struct file *l_dentry_open(struct lvfs_run_ctxt *, struct dentry *,
int flags); int flags);
struct l_linux_dirent { struct l_linux_dirent {
......
...@@ -233,7 +233,7 @@ int lustre_rename(struct dentry *dir, struct vfsmount *mnt, ...@@ -233,7 +233,7 @@ int lustre_rename(struct dentry *dir, struct vfsmount *mnt,
EXPORT_SYMBOL(lustre_rename); EXPORT_SYMBOL(lustre_rename);
/* Note: dput(dchild) will *not* be called if there is an error */ /* Note: dput(dchild) will *not* be called if there is an error */
struct l_file *l_dentry_open(struct lvfs_run_ctxt *ctxt, struct dentry *de, struct file *l_dentry_open(struct lvfs_run_ctxt *ctxt, struct dentry *de,
int flags) int flags)
{ {
struct path path = { struct path path = {
......
...@@ -58,8 +58,8 @@ ...@@ -58,8 +58,8 @@
#if defined(LLOG_LVFS) #if defined(LLOG_LVFS)
static int llog_lvfs_pad(struct obd_device *obd, struct l_file *file, static int llog_lvfs_pad(struct obd_device *obd, struct file *file, int len,
int len, int index) int index)
{ {
struct llog_rec_hdr rec = { 0 }; struct llog_rec_hdr rec = { 0 };
struct llog_rec_tail tail; struct llog_rec_tail tail;
...@@ -88,7 +88,7 @@ static int llog_lvfs_pad(struct obd_device *obd, struct l_file *file, ...@@ -88,7 +88,7 @@ static int llog_lvfs_pad(struct obd_device *obd, struct l_file *file,
return rc; return rc;
} }
static int llog_lvfs_write_blob(struct obd_device *obd, struct l_file *file, static int llog_lvfs_write_blob(struct obd_device *obd, struct file *file,
struct llog_rec_hdr *rec, void *buf, loff_t off) struct llog_rec_hdr *rec, void *buf, loff_t off)
{ {
int rc; int rc;
...@@ -140,7 +140,7 @@ static int llog_lvfs_write_blob(struct obd_device *obd, struct l_file *file, ...@@ -140,7 +140,7 @@ static int llog_lvfs_write_blob(struct obd_device *obd, struct l_file *file,
return rc; return rc;
} }
static int llog_lvfs_read_blob(struct obd_device *obd, struct l_file *file, static int llog_lvfs_read_blob(struct obd_device *obd, struct file *file,
void *buf, int size, loff_t off) void *buf, int size, loff_t off)
{ {
loff_t offset = off; loff_t offset = off;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment