diff options
| author | Trond Myklebust <trond.myklebust@fys.uio.no> | 2005-01-04 21:42:30 +0100 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@fys.uio.no> | 2005-01-04 21:42:30 +0100 |
| commit | eaffe965448685d2f8db3a29cf00c132f296abb6 (patch) | |
| tree | 4145dec449716eb396a2aecd32dae60046172376 /fs | |
| parent | 842134f1e3a19a98f1757e11f509f63fd5257714 (diff) | |
| download | history-eaffe965448685d2f8db3a29cf00c132f296abb6.tar.gz | |
VFS: Remove LOCK_USE_CLNT. It should no longer be necessary.
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/locks.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/locks.c b/fs/locks.c index fd6e88bb9890d6..1a8c578e7ccd45 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1563,9 +1563,6 @@ int fcntl_getlk(struct file *filp, struct flock __user *l) error = filp->f_op->lock(filp, F_GETLK, &file_lock); if (error < 0) goto out; - else if (error == LOCK_USE_CLNT) - /* Bypass for NFS with no locking - 2.0.36 compat */ - fl = posix_test_lock(filp, &file_lock); else fl = (file_lock.fl_type == F_UNLCK ? NULL : &file_lock); } else { @@ -1708,9 +1705,6 @@ int fcntl_getlk64(struct file *filp, struct flock64 __user *l) error = filp->f_op->lock(filp, F_GETLK, &file_lock); if (error < 0) goto out; - else if (error == LOCK_USE_CLNT) - /* Bypass for NFS with no locking - 2.0.36 compat */ - fl = posix_test_lock(filp, &file_lock); else fl = (file_lock.fl_type == F_UNLCK ? NULL : &file_lock); } else { |