diff options
| author | David Teigland <teigland@redhat.com> | 2009-01-19 13:13:33 -0600 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2009-01-21 15:28:45 -0600 |
| commit | 24179f488092267c9a033d7e25ce7a58af50ff79 (patch) | |
| tree | a4f4fc6a038ba8240350a4b47d9a1f405790e78f /fs/dlm | |
| parent | f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b (diff) | |
| download | linux-3.10-24179f488092267c9a033d7e25ce7a58af50ff79.tar.gz linux-3.10-24179f488092267c9a033d7e25ce7a58af50ff79.tar.bz2 linux-3.10-24179f488092267c9a033d7e25ce7a58af50ff79.zip | |
dlm: fix plock notify callback to lockd
We should use the original copy of the file_lock, fl, instead
of the copy, flc in the lockd notify callback. The range in flc has
been modified by posix_lock_file(), so it will not match a copy of the
lock in lockd.
Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm')
| -rw-r--r-- | fs/dlm/plock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c index eba87ff3177..502b1ea5ef6 100644 --- a/fs/dlm/plock.c +++ b/fs/dlm/plock.c @@ -168,7 +168,7 @@ static int dlm_plock_callback(struct plock_op *op) notify = xop->callback; if (op->info.rv) { - notify(flc, NULL, op->info.rv); + notify(fl, NULL, op->info.rv); goto out; } @@ -187,7 +187,7 @@ static int dlm_plock_callback(struct plock_op *op) (unsigned long long)op->info.number, file, fl); } - rv = notify(flc, NULL, 0); + rv = notify(fl, NULL, 0); if (rv) { /* XXX: We need to cancel the fs lock here: */ log_print("dlm_plock_callback: lock granted after lock request " |