diff options
| author | Jeff Layton <jlayton@redhat.com> | 2009-01-21 11:34:50 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-02-06 14:00:45 -0800 |
| commit | 91dbeaec2e6c589217394eaf5112f33bdc49f208 (patch) | |
| tree | 0290f302708b77c1873b90c1392d202b4410adb7 /fs | |
| parent | c92391233d3ce7337a131295f9838b74d2ba32f6 (diff) | |
| download | linux-stable-91dbeaec2e6c589217394eaf5112f33bdc49f208.tar.gz linux-stable-91dbeaec2e6c589217394eaf5112f33bdc49f208.tar.bz2 linux-stable-91dbeaec2e6c589217394eaf5112f33bdc49f208.zip | |
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/dlm/plock.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c index eba87ff3177b..ca46f11720b3 100644 --- a/fs/dlm/plock.c +++ b/fs/dlm/plock.c @@ -304,7 +304,9 @@ int dlm_posix_get(dlm_lockspace_t *lockspace, u64 number, struct file *file, if (rv == -ENOENT) rv = 0; else if (rv > 0) { + locks_init_lock(fl); fl->fl_type = (op->info.ex) ? F_WRLCK : F_RDLCK; + fl->fl_flags = FL_POSIX; fl->fl_pid = op->info.pid; fl->fl_start = op->info.start; fl->fl_end = op->info.end; |