diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-28 15:23:01 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-28 15:23:01 -0700 |
commit | af8be4e4b316df36a00c1e52a9970c253783b57e (patch) | |
tree | 6d56665916e601ed6a933d6f85c22ee8512c6531 /fs/pnode.c | |
parent | d478376cb0dc9ab16a2b6e02fd8cd1174e724c64 (diff) | |
parent | 6758f953d05378d907a164c67934cd86183d9c88 (diff) | |
download | kernel-crypto-af8be4e4b316df36a00c1e52a9970c253783b57e.tar.gz kernel-crypto-af8be4e4b316df36a00c1e52a9970c253783b57e.tar.xz kernel-crypto-af8be4e4b316df36a00c1e52a9970c253783b57e.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
[PATCH] mnt_expire is protected by namespace_sem, no need for vfsmount_lock
[PATCH] do shrink_submounts() for all fs types
[PATCH] sanitize locking in mark_mounts_for_expiry() and shrink_submounts()
[PATCH] count ghost references to vfsmounts
[PATCH] reduce stack footprint in namespace.c
Diffstat (limited to 'fs/pnode.c')
-rw-r--r-- | fs/pnode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/pnode.c b/fs/pnode.c index 05ba692bc54..1d8f5447f3f 100644 --- a/fs/pnode.c +++ b/fs/pnode.c @@ -225,7 +225,7 @@ out: */ static inline int do_refcount_check(struct vfsmount *mnt, int count) { - int mycount = atomic_read(&mnt->mnt_count); + int mycount = atomic_read(&mnt->mnt_count) - mnt->mnt_ghosts; return (mycount > count); } |