Merge branches 'irq-fixes-for-linus' and 'sched-fixes-for-linus' of git://git.kernel...

[mirror_ubuntu-bionic-kernel.git] / fs / 9p / vfs_super.c

diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c
index f84d625b87907452771da24c5f148568c4376ece..09fd08d1606fb5bf97b05de78722e74eb7f4b710 100644 (file)
--- a/fs/9p/vfs_super.c
+++ b/fs/9p/vfs_super.c
@@ -168,7 +168,7 @@ static struct dentry *v9fs_mount(struct file_system_type *fs_type, int flags,
                        retval = PTR_ERR(st);
                        goto release_sb;
                }
-
+               root->d_inode->i_ino = v9fs_qid2ino(&st->qid);
                v9fs_stat2inode_dotl(st, root->d_inode);
                kfree(st);
        } else {
@@ -293,6 +293,20 @@ static int v9fs_sync_fs(struct super_block *sb, int wait)
        return p9_client_sync_fs(v9ses->root_fid);
 }
 
+static int v9fs_drop_inode(struct inode *inode)
+{
+       struct v9fs_session_info *v9ses;
+       v9ses = v9fs_inode2v9ses(inode);
+       if (v9ses->cache)
+               return generic_drop_inode(inode);
+       /*
+        * in case of non cached mode always drop the
+        * the inode because we want the inode attribute
+        * to always match that on the server.
+        */
+       return 1;
+}
+
 static const struct super_operations v9fs_super_ops = {
        .alloc_inode = v9fs_alloc_inode,
        .destroy_inode = v9fs_destroy_inode,
@@ -307,6 +321,7 @@ static const struct super_operations v9fs_super_ops_dotl = {
        .destroy_inode = v9fs_destroy_inode,
        .sync_fs = v9fs_sync_fs,
        .statfs = v9fs_statfs,
+       .drop_inode = v9fs_drop_inode,
        .evict_inode = v9fs_evict_inode,
        .show_options = generic_show_options,
        .umount_begin = v9fs_umount_begin,
@@ -317,5 +332,5 @@ struct file_system_type v9fs_fs_type = {
        .mount = v9fs_mount,
        .kill_sb = v9fs_kill_super,
        .owner = THIS_MODULE,
-       .fs_flags = FS_RENAME_DOES_D_MOVE,
+       .fs_flags = FS_RENAME_DOES_D_MOVE|FS_REVAL_DOT,
 };