diff options
| author | Marc Eshel <eshel@almaden.ibm.com> | 2007-01-19 00:15:35 +0300 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2007-05-07 03:23:24 +0400 |
| commit | 150b393456e5a23513cace286a019e87151e47f0 (patch) | |
| tree | 91599ec9b759f7e3c5defcb8dd361acd7288154c /fs/lockd/svcsubs.c | |
| parent | 7723ec9777d9832849b76475b1a21a2872a40d20 (diff) | |
| download | linux-150b393456e5a23513cace286a019e87151e47f0.tar.xz | |
locks: allow {vfs,posix}_lock_file to return conflicting lock
The nfsv4 protocol's lock operation, in the case of a conflict, returns
information about the conflicting lock.
It's unclear how clients can use this, so for now we're not going so far as to
add a filesystem method that can return a conflicting lock, but we may as well
return something in the local case when it's easy to.
Signed-off-by: Marc Eshel <eshel@almaden.ibm.com>
Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Diffstat (limited to 'fs/lockd/svcsubs.c')
| -rw-r--r-- | fs/lockd/svcsubs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c index c0df00c74ce3..50957089be1f 100644 --- a/fs/lockd/svcsubs.c +++ b/fs/lockd/svcsubs.c @@ -182,7 +182,7 @@ again: lock.fl_type = F_UNLCK; lock.fl_start = 0; lock.fl_end = OFFSET_MAX; - if (posix_lock_file(file->f_file, &lock) < 0) { + if (posix_lock_file(file->f_file, &lock, NULL) < 0) { printk("lockd: unlock failure in %s:%d\n", __FILE__, __LINE__); return 1; |