diff options
-rw-r--r-- | fs/namei.c | 2 | ||||
-rw-r--r-- | include/linux/mount.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/namei.c b/fs/namei.c index fa8df81ce8ca..1d93cb4f7c5f 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
@@ -314,7 +314,7 @@ void path_release(struct nameidata *nd) | |||
314 | void path_release_on_umount(struct nameidata *nd) | 314 | void path_release_on_umount(struct nameidata *nd) |
315 | { | 315 | { |
316 | dput(nd->dentry); | 316 | dput(nd->dentry); |
317 | _mntput(nd->mnt); | 317 | mntput_no_expire(nd->mnt); |
318 | } | 318 | } |
319 | 319 | ||
320 | /* | 320 | /* |
diff --git a/include/linux/mount.h b/include/linux/mount.h index 196d2d6de4a3..74b4727a4e30 100644 --- a/include/linux/mount.h +++ b/include/linux/mount.h | |||
@@ -47,7 +47,7 @@ static inline struct vfsmount *mntget(struct vfsmount *mnt) | |||
47 | 47 | ||
48 | extern void __mntput(struct vfsmount *mnt); | 48 | extern void __mntput(struct vfsmount *mnt); |
49 | 49 | ||
50 | static inline void _mntput(struct vfsmount *mnt) | 50 | static inline void mntput_no_expire(struct vfsmount *mnt) |
51 | { | 51 | { |
52 | if (mnt) { | 52 | if (mnt) { |
53 | if (atomic_dec_and_test(&mnt->mnt_count)) | 53 | if (atomic_dec_and_test(&mnt->mnt_count)) |
@@ -59,7 +59,7 @@ static inline void mntput(struct vfsmount *mnt) | |||
59 | { | 59 | { |
60 | if (mnt) { | 60 | if (mnt) { |
61 | mnt->mnt_expiry_mark = 0; | 61 | mnt->mnt_expiry_mark = 0; |
62 | _mntput(mnt); | 62 | mntput_no_expire(mnt); |
63 | } | 63 | } |
64 | } | 64 | } |
65 | 65 | ||