->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/gfs2/export.c b/fs/gfs2/export.c
index 70ba891654f8..e8ed6d4a6181 100644
--- a/fs/gfs2/export.c
+++ b/fs/gfs2/export.c
@@ -28,15 +28,14 @@
 #define GFS2_LARGE_FH_SIZE 8
 #define GFS2_OLD_FH_SIZE 10
 
-static int gfs2_encode_fh(struct dentry *dentry, __u32 *p, int *len,
-                          int connectable)
+static int gfs2_encode_fh(struct inode *inode, __u32 *p, int *len,
+                          struct inode *parent)
 {
         __be32 *fh = (__force __be32 *)p;
-        struct inode *inode = dentry->d_inode;
         struct super_block *sb = inode->i_sb;
         struct gfs2_inode *ip = GFS2_I(inode);
 
-        if (connectable && (*len < GFS2_LARGE_FH_SIZE)) {
+        if (parent && (*len < GFS2_LARGE_FH_SIZE)) {
                 *len = GFS2_LARGE_FH_SIZE;
                 return 255;
         } else if (*len < GFS2_SMALL_FH_SIZE) {
@@ -50,14 +49,10 @@ static int gfs2_encode_fh(struct dentry *dentry, __u32 *p, int *len,
         fh[3] = cpu_to_be32(ip->i_no_addr & 0xFFFFFFFF);
         *len = GFS2_SMALL_FH_SIZE;
 
-        if (!connectable || inode == sb->s_root->d_inode)
+        if (!parent || inode == sb->s_root->d_inode)
                 return *len;
 
-        spin_lock(&dentry->d_lock);
-        inode = dentry->d_parent->d_inode;
-        ip = GFS2_I(inode);
-        igrab(inode);
-        spin_unlock(&dentry->d_lock);
+        ip = GFS2_I(parent);
 
         fh[4] = cpu_to_be32(ip->i_no_formal_ino >> 32);
         fh[5] = cpu_to_be32(ip->i_no_formal_ino & 0xFFFFFFFF);
@@ -65,8 +60,6 @@ static int gfs2_encode_fh(struct dentry *dentry, __u32 *p, int *len,
         fh[7] = cpu_to_be32(ip->i_no_addr & 0xFFFFFFFF);
         *len = GFS2_LARGE_FH_SIZE;
 
-        iput(inode);
-
         return *len;
 }