diff options
author | Vasily Averin <vvs@parallels.com> | 2014-07-21 04:30:23 -0400 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2014-07-24 06:18:12 -0400 |
commit | 295dc39d941dc2ae53d5c170365af4c9d5c16212 (patch) | |
tree | 5f2b9e64cd719ca76760812a0d143d6817216624 /fs | |
parent | 6fcc5420bfb91049a318bb4d88fe471248b5b391 (diff) |
fs: umount on symlink leaks mnt count
Currently umount on symlink blocks following umount:
/vz is separate mount
# ls /vz/ -al | grep test
drwxr-xr-x. 2 root root 4096 Jul 19 01:14 testdir
lrwxrwxrwx. 1 root root 11 Jul 19 01:16 testlink -> /vz/testdir
# umount -l /vz/testlink
umount: /vz/testlink: not mounted (expected)
# lsof /vz
# umount /vz
umount: /vz: device is busy. (unexpected)
In this case mountpoint_last() gets an extra refcount on path->mnt
Signed-off-by: Vasily Averin <vvs@openvz.org>
Acked-by: Ian Kent <raven@themaw.net>
Acked-by: Jeff Layton <jlayton@primarydata.com>
Cc: stable@vger.kernel.org
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/namei.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/namei.c b/fs/namei.c index 985c6f368485..9eb787e5c167 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
@@ -2256,9 +2256,10 @@ done: | |||
2256 | goto out; | 2256 | goto out; |
2257 | } | 2257 | } |
2258 | path->dentry = dentry; | 2258 | path->dentry = dentry; |
2259 | path->mnt = mntget(nd->path.mnt); | 2259 | path->mnt = nd->path.mnt; |
2260 | if (should_follow_link(dentry, nd->flags & LOOKUP_FOLLOW)) | 2260 | if (should_follow_link(dentry, nd->flags & LOOKUP_FOLLOW)) |
2261 | return 1; | 2261 | return 1; |
2262 | mntget(path->mnt); | ||
2262 | follow_mount(path); | 2263 | follow_mount(path); |
2263 | error = 0; | 2264 | error = 0; |
2264 | out: | 2265 | out: |