From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 12 Jul 2014 05:53:32 +0000 (-0700)
Subject: staging: lustre: remove l_dentry define
X-Git-Tag: firefly_0821_release~176^2~3491^2~880
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=178b69013264c365f4a6421a355f3512d788f3e0;p=firefly-linux-kernel-4.4.55.git

staging: lustre: remove l_dentry define

It's a 'dentry', so use it instead of something else.

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 0dea1789321d..cf6d5807af61 100644
--- a/drivers/staging/lustre/lustre/include/linux/lvfs_linux.h
+++ b/drivers/staging/lustre/lustre/include/linux/lvfs_linux.h
@@ -44,12 +44,11 @@
 #include "../lvfs.h"
 
 #define l_file file
-#define l_dentry dentry
 
 #define l_filp_open filp_open
 
 struct lvfs_run_ctxt;
-struct l_file *l_dentry_open(struct lvfs_run_ctxt *, struct l_dentry *,
+struct l_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 a519a5ca69ba..2decf7ddc6c8 100644
--- a/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c
+++ b/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c
@@ -233,7 +233,7 @@ 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 l_dentry *de,
+struct l_file *l_dentry_open(struct lvfs_run_ctxt *ctxt, struct dentry *de,
 			     int flags)
 {
 	struct path path = {
diff --git a/drivers/staging/lustre/lustre/obdclass/llog_lvfs.c b/drivers/staging/lustre/lustre/obdclass/llog_lvfs.c
index 85d64bec1657..c707cd88eb45 100644
--- a/drivers/staging/lustre/lustre/obdclass/llog_lvfs.c
+++ b/drivers/staging/lustre/lustre/obdclass/llog_lvfs.c
@@ -581,7 +581,7 @@ static int llog_lvfs_open(const struct lu_env *env,  struct llog_handle *handle,
 			  enum llog_open_param open_param)
 {
 	struct llog_ctxt	*ctxt = handle->lgh_ctxt;
-	struct l_dentry		*dchild = NULL;
+	struct dentry		*dchild = NULL;
 	struct obd_device	*obd;
 	int			 rc = 0;
 
@@ -672,7 +672,7 @@ static int llog_lvfs_create(const struct lu_env *env,
 {
 	struct llog_ctxt	*ctxt = handle->lgh_ctxt;
 	struct obd_device	*obd;
-	struct l_dentry		*dchild = NULL;
+	struct dentry		*dchild = NULL;
 	struct file		*file;
 	struct obdo		*oa = NULL;
 	int			 rc = 0;