aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2006-01-18 20:43:22 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-18 22:20:25 -0500
commit796dadfd02eda1e3e6e42ecc8379d8b1c1523ddf (patch)
treeff9d4c34f8b598aca7481d6b2bf41dd31a483c82
parent04ef59548470b81829e8593c1b39776ce0534d68 (diff)
[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>
-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 3510e2ca40d2..e13d2233ff8c 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)
2989 2989
2990 lock_kernel(); 2990 lock_kernel();
2991 for (flpp = &inode->i_flock; *flpp != NULL; flpp = &(*flpp)->fl_next) { 2991 for (flpp = &inode->i_flock; *flpp != NULL; flpp = &(*flpp)->fl_next) {
2992 if ((*flpp)->fl_owner == (fl_owner_t)lowner) 2992 if ((*flpp)->fl_owner == (fl_owner_t)lowner) {
2993 status = 1; 2993 status = 1;
2994 goto out; 2994 goto out;
2995 }
2995 } 2996 }
2996out: 2997out:
2997 unlock_kernel(); 2998 unlock_kernel();