Merge tag 'for-6.0-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...

[platform/kernel/linux-starfive.git] / fs / 9p / vfs_super.c

diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c
index b739e02..2d9ee07 100644 (file)
--- a/fs/9p/vfs_super.c
+++ b/fs/9p/vfs_super.c
@@ -20,6 +20,7 @@
 #include <linux/slab.h>
 #include <linux/statfs.h>
 #include <linux/magic.h>
+#include <linux/fscache.h>
 #include <net/9p/9p.h>
 #include <net/9p/client.h>
 
@@ -183,13 +184,13 @@ static struct dentry *v9fs_mount(struct file_system_type *fs_type, int flags,
        retval = v9fs_get_acl(inode, fid);
        if (retval)
                goto release_sb;
-       v9fs_fid_add(root, fid);
+       v9fs_fid_add(root, &fid);
 
        p9_debug(P9_DEBUG_VFS, " simple set mount, return 0\n");
        return dget(sb->s_root);
 
 clunk_fid:
-       p9_client_clunk(fid);
+       p9_fid_put(fid);
        v9fs_session_close(v9ses);
 free_session:
        kfree(v9ses);
@@ -202,7 +203,7 @@ release_sb:
         * attached the fid to dentry so it won't get clunked
         * automatically.
         */
-       p9_client_clunk(fid);
+       p9_fid_put(fid);
        deactivate_locked_super(sb);
        return ERR_PTR(retval);
 }
@@ -269,7 +270,7 @@ static int v9fs_statfs(struct dentry *dentry, struct kstatfs *buf)
        }
        res = simple_statfs(dentry, buf);
 done:
-       p9_client_clunk(fid);
+       p9_fid_put(fid);
        return res;
 }
 
@@ -309,6 +310,7 @@ static int v9fs_write_inode(struct inode *inode,
                __mark_inode_dirty(inode, I_DIRTY_DATASYNC);
                return ret;
        }
+       fscache_unpin_writeback(wbc, v9fs_inode_cookie(v9inode));
        return 0;
 }
 
@@ -332,6 +334,7 @@ static int v9fs_write_inode_dotl(struct inode *inode,
                __mark_inode_dirty(inode, I_DIRTY_DATASYNC);
                return ret;
        }
+       fscache_unpin_writeback(wbc, v9fs_inode_cookie(v9inode));
        return 0;
 }