->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, 4 insertions, 8 deletions

diff --git a/mm/cleancache.c b/mm/cleancache.c
index 5646c740f613..32e6f4136fa2 100644
--- a/mm/cleancache.c
+++ b/mm/cleancache.c
@@ -80,7 +80,7 @@ EXPORT_SYMBOL(__cleancache_init_shared_fs);
 static int cleancache_get_key(struct inode *inode,
                               struct cleancache_filekey *key)
 {
-        int (*fhfn)(struct dentry *, __u32 *fh, int *, int);
+        int (*fhfn)(struct inode *, __u32 *fh, int *, struct inode *);
         int len = 0, maxlen = CLEANCACHE_KEY_MAX;
         struct super_block *sb = inode->i_sb;
 
@@ -88,9 +88,7 @@ static int cleancache_get_key(struct inode *inode,
         if (sb->s_export_op != NULL) {
                 fhfn = sb->s_export_op->encode_fh;
                 if  (fhfn) {
-                        struct dentry d;
-                        d.d_inode = inode;
-                        len = (*fhfn)(&d, &key->u.fh[0], &maxlen, 0);
+                        len = (*fhfn)(inode, &key->u.fh[0], &maxlen, NULL);
                         if (len <= 0 || len == 255)
                                 return -1;
                         if (maxlen > CLEANCACHE_KEY_MAX)
diff --git a/mm/shmem.c b/mm/shmem.c
index be5af34a070d..3711422c3172 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2033,11 +2033,9 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
         return dentry;
 }
 
-static int shmem_encode_fh(struct dentry *dentry, __u32 *fh, int *len,
-                                int connectable)
+static int shmem_encode_fh(struct inode *inode, __u32 *fh, int *len,
+                                struct inode *parent)
 {
-        struct inode *inode = dentry->d_inode;
-
         if (*len < 3) {
                 *len = 3;
                 return 255;