diff options
| author |   Marc Eshel <eshel@almaden.ibm.com> | 2006-11-14 16:37:25 -0500 |
|---|---|---|
| committer |   J. Bruce Fields <bfields@citi.umich.edu> | 2007-05-06 20:38:50 -0400 |
| commit | 586759f03e2e9031ac5589912a51a909ed53c30a (patch) | |
| tree | 5c788be0c13fb6d0baf3824e29a6bb6b195bf61a /fs/gfs2/ops_file.c | |
| parent | lockd: add code to handle deferred lock requests (diff) | |
| download | linux-dev-586759f03e2e9031ac5589912a51a909ed53c30a.tar.xz linux-dev-586759f03e2e9031ac5589912a51a909ed53c30a.zip | |
gfs2: nfs lock support for gfs2
Add NFS lock support to GFS2.
Signed-off-by: Marc Eshel <eshel@almaden.ibm.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Acked-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/ops_file.c')
| -rw-r--r-- | fs/gfs2/ops_file.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c index 48b248d7c823..329c4dcdecdb 100644 --- a/fs/gfs2/ops_file.c +++ b/fs/gfs2/ops_file.c @@ -520,6 +520,11 @@ static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl) } } + if (cmd == F_CANCELLK) { + /* Hack: */ + cmd = F_SETLK; + fl->fl_type = F_UNLCK; + } if (IS_GETLK(cmd)) return gfs2_lm_plock_get(sdp, &name, file, fl); else if (fl->fl_type == F_UNLCK) |