From e4265658ce723a109587561a58f3a1cdbcb84f78 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 11 Jul 2014 22:57:40 -0700 Subject: [PATCH] staging: lustre: remove l_filep_open define Just call filep_open(), no need to rename the thing. Cc: Andreas Dilger Cc: Oleg Drokin Cc: hpdd-discuss Signed-off-by: Greg Kroah-Hartman --- drivers/staging/lustre/lustre/include/linux/lvfs_linux.h | 2 -- drivers/staging/lustre/lustre/obdclass/llog_lvfs.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/lustre/lustre/include/linux/lvfs_linux.h b/drivers/staging/lustre/lustre/include/linux/lvfs_linux.h index 3eab65a55bda..fff22ec1f869 100644 --- a/drivers/staging/lustre/lustre/include/linux/lvfs_linux.h +++ b/drivers/staging/lustre/lustre/include/linux/lvfs_linux.h @@ -43,8 +43,6 @@ #include "../lvfs.h" -#define l_filp_open filp_open - struct lvfs_run_ctxt; struct file *l_dentry_open(struct lvfs_run_ctxt *, struct dentry *, int flags); diff --git a/drivers/staging/lustre/lustre/obdclass/llog_lvfs.c b/drivers/staging/lustre/lustre/obdclass/llog_lvfs.c index a48cbe056555..1ba789f8d526 100644 --- a/drivers/staging/lustre/lustre/obdclass/llog_lvfs.c +++ b/drivers/staging/lustre/lustre/obdclass/llog_lvfs.c @@ -567,7 +567,7 @@ static struct file *llog_filp_open(char *dir, char *name, int flags, int mode) if (len >= PATH_MAX - 1) { filp = ERR_PTR(-ENAMETOOLONG); } else { - filp = l_filp_open(logname, flags, mode); + filp = filp_open(logname, flags, mode); if (IS_ERR(filp) && PTR_ERR(filp) != -ENOENT) CERROR("logfile creation %s: %ld\n", logname, PTR_ERR(filp)); -- 2.39.5