->encode_fh() API change

pass inode + parent's inode or NULL instead of dentry + bool saying
whether we want the parent or not.

NOTE: that needs ceph fix folded in.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

2 files changed, 14 insertions, 20 deletions

diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index 59d06871a850..a6d4268fb6c1 100644
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
@@ -1592,13 +1592,12 @@ struct dentry *reiserfs_fh_to_parent(struct super_block *sb, struct fid *fid,
                 (fh_type == 6) ? fid->raw[5] : 0);
 }
 
-int reiserfs_encode_fh(struct dentry *dentry, __u32 * data, int *lenp,
-                       int need_parent)
+int reiserfs_encode_fh(struct inode *inode, __u32 * data, int *lenp,
+                       struct inode *parent)
 {
-        struct inode *inode = dentry->d_inode;
         int maxlen = *lenp;
 
-        if (need_parent && (maxlen < 5)) {
+        if (parent && (maxlen < 5)) {
                 *lenp = 5;
                 return 255;
         } else if (maxlen < 3) {
@@ -1610,20 +1609,15 @@ int reiserfs_encode_fh(struct dentry *dentry, __u32 * data, int *lenp,
         data[1] = le32_to_cpu(INODE_PKEY(inode)->k_dir_id);
         data[2] = inode->i_generation;
         *lenp = 3;
-        /* no room for directory info? return what we've stored so far */
-        if (maxlen < 5 || !need_parent)
-                return 3;
-
-        spin_lock(&dentry->d_lock);
-        inode = dentry->d_parent->d_inode;
-        data[3] = inode->i_ino;
-        data[4] = le32_to_cpu(INODE_PKEY(inode)->k_dir_id);
-        *lenp = 5;
-        if (maxlen >= 6) {
-                data[5] = inode->i_generation;
-                *lenp = 6;
-        }
-        spin_unlock(&dentry->d_lock);
+        if (parent) {
+                data[3] = parent->i_ino;
+                data[4] = le32_to_cpu(INODE_PKEY(parent)->k_dir_id);
+                *lenp = 5;
+                if (maxlen >= 6) {
+                        data[5] = parent->i_generation;
+                        *lenp = 6;
+                }
+        }
         return *lenp;
 }
 
diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
index a59d27126338..14a4f9dfb171 100644
--- a/fs/reiserfs/reiserfs.h
+++ b/fs/reiserfs/reiserfs.h
@@ -2611,8 +2611,8 @@ struct dentry *reiserfs_fh_to_dentry(struct super_block *sb, struct fid *fid,
                                      int fh_len, int fh_type);
 struct dentry *reiserfs_fh_to_parent(struct super_block *sb, struct fid *fid,
                                      int fh_len, int fh_type);
-int reiserfs_encode_fh(struct dentry *dentry, __u32 * data, int *lenp,
-                       int connectable);
+int reiserfs_encode_fh(struct inode *inode, __u32 * data, int *lenp,
+                       struct inode *parent);
 
 int reiserfs_truncate_file(struct inode *, int update_timestamps);
 void make_cpu_key(struct cpu_key *cpu_key, struct inode *inode, loff_t offset,