summaryrefslogtreecommitdiff
path: root/fs/nfsd
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2006-01-18 17:43:22 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-18 19:20:25 -0800
commit796dadfd02eda1e3e6e42ecc8379d8b1c1523ddf (patch)
treeff9d4c34f8b598aca7481d6b2bf41dd31a483c82 /fs/nfsd
parent04ef59548470b81829e8593c1b39776ce0534d68 (diff)
downloadlinux-3.10-796dadfd02eda1e3e6e42ecc8379d8b1c1523ddf.tar.gz
linux-3.10-796dadfd02eda1e3e6e42ecc8379d8b1c1523ddf.tar.bz2
linux-3.10-796dadfd02eda1e3e6e42ecc8379d8b1c1523ddf.zip
[PATCH] nfsd4: fix check_for_locks
Fix some bad logic. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/nfs4state.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 3510e2ca40d..e13d2233ff8 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -2989,9 +2989,10 @@ check_for_locks(struct file *filp, struct nfs4_stateowner *lowner)
lock_kernel();
for (flpp = &inode->i_flock; *flpp != NULL; flpp = &(*flpp)->fl_next) {
- if ((*flpp)->fl_owner == (fl_owner_t)lowner)
+ if ((*flpp)->fl_owner == (fl_owner_t)lowner) {
status = 1;
goto out;
+ }
}
out:
unlock_kernel();