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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/include/linux/lvfs_linux.h b/drivers/staging/lustre/lustre/include/linux/lvfs_linux.h
index cf6d5807af61bfb35008d917daac6c47728c33f0..3eab65a55bda0ff74ebb52f02e89cfadd504ac10 100644 (file)
--- a/drivers/staging/lustre/lustre/include/linux/lvfs_linux.h
+++ b/drivers/staging/lustre/lustre/include/linux/lvfs_linux.h
@@ -43,12 +43,10 @@
 
 #include "../lvfs.h"
 
-#define l_file file
-
 #define l_filp_open filp_open
 
 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);
 
 struct l_linux_dirent {

diff --git a/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c b/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c
index 2decf7ddc6c866d99933b25de3194dacaa0e5fb2..191a70a9e66512729db9eb02141e5beb1ba93f96 100644 (file)
--- a/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c
+++ b/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c
@@ -233,8 +233,8 @@ put_old:
 EXPORT_SYMBOL(lustre_rename);
 
 /* 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,
-                            int flags)
+struct file *l_dentry_open(struct lvfs_run_ctxt *ctxt, struct dentry *de,
+                          int flags)
 {
        struct path path = {
                .dentry = de,

diff --git a/drivers/staging/lustre/lustre/obdclass/llog_lvfs.c b/drivers/staging/lustre/lustre/obdclass/llog_lvfs.c
index c707cd88eb45b07fb90c4ea97d35b432add16dec..a48cbe0565552ead921944981c9be17b609af547 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/llog_lvfs.c
+++ b/drivers/staging/lustre/lustre/obdclass/llog_lvfs.c
@@ -58,8 +58,8 @@
 
 #if  defined(LLOG_LVFS)
 
-static int llog_lvfs_pad(struct obd_device *obd, struct l_file *file,
-                               int len, int index)
+static int llog_lvfs_pad(struct obd_device *obd, struct file *file, int len,
+                        int index)
 {
        struct llog_rec_hdr rec = { 0 };
        struct llog_rec_tail tail;
@@ -88,7 +88,7 @@ static int llog_lvfs_pad(struct obd_device *obd, struct l_file *file,
        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)
 {
        int rc;
@@ -140,7 +140,7 @@ static int llog_lvfs_write_blob(struct obd_device *obd, struct l_file *file,
        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)
 {
        loff_t offset = off;