From 1668b82116fa57d0061b4e05e423ed25efa7b784 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 11 Jul 2014 22:56:16 -0700 Subject: [PATCH] staging: lustre: remove l_file define It's a "file" structure, so use it instead of trying to rename it. Cc: Andreas Dilger Cc: Oleg Drokin Cc: hpdd-discuss Signed-off-by: Greg Kroah-Hartman --- drivers/staging/lustre/lustre/include/linux/lvfs_linux.h | 4 +--- drivers/staging/lustre/lustre/lvfs/lvfs_linux.c | 4 ++-- drivers/staging/lustre/lustre/obdclass/llog_lvfs.c | 8 ++++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/staging/lustre/lustre/include/linux/lvfs_linux.h b/drivers/staging/lustre/lustre/include/linux/lvfs_linux.h index cf6d5807af61..3eab65a55bda 100644 --- 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 2decf7ddc6c8..191a70a9e665 100644 --- 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 c707cd88eb45..a48cbe056555 100644 --- 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; -- 2.39.5