diff options
| author | Steve French <sfrench@us.ibm.com> | 2011-01-10 02:18:16 +0300 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2011-01-10 02:18:16 +0300 |
| commit | acc6f11272ce4f77c40b1a6292eb198fd6aaf8c3 (patch) | |
| tree | 2da3a61b6726707a89f1cf93446aabd2fb00e1f0 /fs/pnode.c | |
| parent | 7e12eddb73d4f288b0339ee13832a34d6bc4fd90 (diff) | |
| parent | 0c21e3aaf6ae85bee804a325aa29c325209180fd (diff) | |
| download | linux-acc6f11272ce4f77c40b1a6292eb198fd6aaf8c3.tar.xz | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/dir.c
Diffstat (limited to 'fs/pnode.c')
| -rw-r--r-- | fs/pnode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/pnode.c b/fs/pnode.c index 8066b8dd748f..d42514e32380 100644 --- a/fs/pnode.c +++ b/fs/pnode.c @@ -288,7 +288,7 @@ out: */ static inline int do_refcount_check(struct vfsmount *mnt, int count) { - int mycount = atomic_read(&mnt->mnt_count) - mnt->mnt_ghosts; + int mycount = mnt_get_count(mnt) - mnt->mnt_ghosts; return (mycount > count); } @@ -300,7 +300,7 @@ static inline int do_refcount_check(struct vfsmount *mnt, int count) * Check if any of these mounts that **do not have submounts** * have more references than 'refcnt'. If so return busy. * - * vfsmount lock must be held for read or write + * vfsmount lock must be held for write */ int propagate_mount_busy(struct vfsmount *mnt, int refcnt) { |