Remove redundant inode parameter from mds_fs_journal_data().

diff --git a/lustre/include/linux/lustre_mds.h b/lustre/include/linux/lustre_mds.h
index 1d27fe0..82b2beb 100644 (file)
--- a/lustre/include/linux/lustre_mds.h
+++ b/lustre/include/linux/lustre_mds.h
@@ -113,8 +113,8 @@ void mds_rename_pack(struct mds_rec_rename *, struct inode *srcdir,
 /* mds/handler.c */
 struct dentry *mds_fid2dentry(struct mds_obd *mds, struct ll_fid *fid, struct vfsmount **mnt);
 
-/* llight/request.c */
-int mdc_connect(struct ptlrpc_client *, struct ptlrpc_connection *, 
+/* mdc/mdc_request.c */
+int mdc_connect(struct ptlrpc_client *, struct ptlrpc_connection *,
                 struct ll_fid *rootfid, struct ptlrpc_request **);
 int mdc_getattr(struct ptlrpc_client *, struct ptlrpc_connection *, ino_t ino,
                 int type, unsigned long valid, struct ptlrpc_request **);
@@ -154,7 +154,7 @@ struct mds_fs_operations {
                                 loff_t *offset);
         void    (* fs_delete_inode)(struct inode *inode);
         void    (* cl_delete_inode)(struct inode *inode);
-        int     (* fs_journal_data)(struct inode *inode, struct file *file);
+        int     (* fs_journal_data)(struct file *file);
         int     (* fs_set_last_rcvd)(struct mds_obd *mds, void *handle);
 };
 
@@ -211,16 +211,19 @@ static inline ssize_t mds_fs_readpage(struct mds_obd *mds, struct file *file,
         return mds->mds_fsops->fs_readpage(file, buf, count, offset);
 }
 
+/* Set up callback to update mds->mds_last_committed with the current
+ * value of mds->mds_last_recieved when this transaction is on disk.
+ */
 static inline int mds_fs_set_last_rcvd(struct mds_obd *mds, void *handle)
 {
         return mds->mds_fsops->fs_set_last_rcvd(mds, handle);
 }
 
+/* Enable data journaling on the given file */
 static inline ssize_t mds_fs_journal_data(struct mds_obd *mds,
-                                          struct inode *inode,
                                           struct file *file)
 {
-        return mds->mds_fsops->fs_journal_data(inode, file);
+        return mds->mds_fsops->fs_journal_data(file);
 }
 
 extern struct mds_fs_operations mds_ext2_fs_ops;

diff --git a/lustre/mds/mds_ext2.c b/lustre/mds/mds_ext2.c
index ac835a2..dcc887a 100644 (file)
--- a/lustre/mds/mds_ext2.c
+++ b/lustre/mds/mds_ext2.c
@@ -99,7 +99,7 @@ static int mds_ext2_set_last_rcvd(struct mds_obd *mds, void *handle)
         return 0;
 }
 
-static int mds_ext2_journal_data(struct inode *inode, struct file *filp)
+static int mds_ext2_journal_data(struct file *filp)
 {
         return 0;
 }

diff --git a/lustre/mds/mds_ext3.c b/lustre/mds/mds_ext3.c
index ea01a0e..64f6b6a 100644 (file)
--- a/lustre/mds/mds_ext3.c
+++ b/lustre/mds/mds_ext3.c
@@ -210,8 +210,10 @@ static int mds_ext3_set_last_rcvd(struct mds_obd *mds, void *handle)
         return 0;
 }
 
-static int mds_ext3_journal_data(struct inode *inode, struct file *filp)
+static int mds_ext3_journal_data(struct file *filp)
 {
+        struct inode *inode = filp->f_dentry->d_inode;
+
         EXT3_I(inode)->i_flags |= EXT3_JOURNAL_DATA_FL;
 
         return 0;