summaryrefslogtreecommitdiffstats
path: root/fs/9p
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-11-22 20:17:54 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2017-11-22 20:17:54 -1000
commitd18bee424b129aa4755268feeeb1ee16cbde6afa (patch)
tree6a35fc4eceed28dbdd828e9f641f9f3d9495262b /fs/9p
parent0c86a6bd85ff0629cd2c5141027fc1c8bb6cde9c (diff)
parent61b272c3aa170b3e461b8df636407b29f35f98eb (diff)
downloadlinux-stable-d18bee424b129aa4755268feeeb1ee16cbde6afa.tar.gz
linux-stable-d18bee424b129aa4755268feeeb1ee16cbde6afa.tar.bz2
linux-stable-d18bee424b129aa4755268feeeb1ee16cbde6afa.zip
Merge branch '9p-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull 9p filesystemfixes from Al Viro: "Several 9p fixes" * '9p-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: 9p: Fix missing commas in mount options net/9p: Switch to wait_event_killable() fs/9p: Compare qid.path in v9fs_test_inode
Diffstat (limited to 'fs/9p')
-rw-r--r--fs/9p/vfs_inode.c3
-rw-r--r--fs/9p/vfs_inode_dotl.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index 2a5de610dd8f..bdabb2765d1b 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -483,6 +483,9 @@ static int v9fs_test_inode(struct inode *inode, void *data)
if (v9inode->qid.type != st->qid.type)
return 0;
+
+ if (v9inode->qid.path != st->qid.path)
+ return 0;
return 1;
}
diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c
index 70f9887c59a9..7f6ae21a27b3 100644
--- a/fs/9p/vfs_inode_dotl.c
+++ b/fs/9p/vfs_inode_dotl.c
@@ -87,6 +87,9 @@ static int v9fs_test_inode_dotl(struct inode *inode, void *data)
if (v9inode->qid.type != st->qid.type)
return 0;
+
+ if (v9inode->qid.path != st->qid.path)
+ return 0;
return 1;
}