]> git.karo-electronics.de Git - karo-tx-linux.git/commit
dlm: initialize file_lock struct in GETLK before copying conflicting lock
authorJeff Layton <jlayton@redhat.com>
Wed, 21 Jan 2009 16:34:50 +0000 (11:34 -0500)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 6 Feb 2009 21:47:24 +0000 (13:47 -0800)
commitf5dec563113acaf3f7e62c55508661741c21e562
tree051a31cce45ff06ea10c3d3d2e5b30d20a725dce
parenta88af3b3c8938d43bb0b0a71508b546086789eee
dlm: initialize file_lock struct in GETLK before copying conflicting lock

commit 20d5a39929232a715f29e6cb7e3f0d0c790f41eb upstream.

dlm_posix_get fills out the relevant fields in the file_lock before
returning when there is a lock conflict, but doesn't clean out any of
the other fields in the file_lock.

When nfsd does a NFSv4 lockt call, it sets the fl_lmops to
nfsd_posix_mng_ops before calling the lower fs. When the lock comes back
after testing a lock on GFS2, it still has that field set. This confuses
nfsd into thinking that the file_lock is a nfsd4 lock.

Fix this by making DLM reinitialize the file_lock before copying the
fields from the conflicting lock.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
fs/dlm/plock.c