]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
nfsd: only set file_lock.fl_lmops in nfsd4_lockt if a stateowner is found
authorJeff Layton <jlayton@redhat.com>
Thu, 22 Jan 2009 19:16:04 +0000 (14:16 -0500)
committerJ. Bruce Fields <bfields@pig.fieldses.org>
Tue, 27 Jan 2009 22:26:59 +0000 (17:26 -0500)
commitfa82a491275a613b15489aab4b99acecb00958d3
tree1c5d1f5fb9d6c1870891bf088493541564b93bc9
parentb914152a6fbd2cd0441bc293ae8b3f3f1a9407b6
nfsd: only set file_lock.fl_lmops in nfsd4_lockt if a stateowner is found

nfsd4_lockt does a search for a lockstateowner when building the lock
struct to test. If one is found, it'll set fl_owner to it. Regardless of
whether that happens, it'll also set fl_lmops. Given that this lock is
basically a "lightweight" lock that's just used for checking conflicts,
setting fl_lmops is probably not appropriate for it.

This behavior exposed a bug in DLM's GETLK implementation where it
wasn't clearing out the fields in the file_lock before filling in
conflicting lock info. While we were able to fix this in DLM, it
still seems pointless and dangerous to set the fl_lmops this way
when we may have a NULL lockstateowner.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@pig.fieldses.org>
fs/nfsd/nfs4state.c