->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>

1 files changed, 5 insertions, 12 deletions

diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 56f6dcf30768..42678a33b7bb 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -627,12 +627,10 @@ static struct dentry *fuse_get_dentry(struct super_block *sb,
         return ERR_PTR(err);
 }
 
-static int fuse_encode_fh(struct dentry *dentry, u32 *fh, int *max_len,
-                           int connectable)
+static int fuse_encode_fh(struct inode *inode, u32 *fh, int *max_len,
+                           struct inode *parent)
 {
-        struct inode *inode = dentry->d_inode;
-        bool encode_parent = connectable && !S_ISDIR(inode->i_mode);
-        int len = encode_parent ? 6 : 3;
+        int len = parent ? 6 : 3;
         u64 nodeid;
         u32 generation;
 
@@ -648,14 +646,9 @@ static int fuse_encode_fh(struct dentry *dentry, u32 *fh, int *max_len,
         fh[1] = (u32)(nodeid & 0xffffffff);
         fh[2] = generation;
 
-        if (encode_parent) {
-                struct inode *parent;
-
-                spin_lock(&dentry->d_lock);
-                parent = dentry->d_parent->d_inode;
+        if (parent) {
                 nodeid = get_fuse_inode(parent)->nodeid;
                 generation = parent->i_generation;
-                spin_unlock(&dentry->d_lock);
 
                 fh[3] = (u32)(nodeid >> 32);
                 fh[4] = (u32)(nodeid & 0xffffffff);
@@ -663,7 +656,7 @@ static int fuse_encode_fh(struct dentry *dentry, u32 *fh, int *max_len,
         }
 
         *max_len = len;
-        return encode_parent ? 0x82 : 0x81;
+        return parent ? 0x82 : 0x81;
 }
 
 static struct dentry *fuse_fh_to_dentry(struct super_block *sb,