diff options
| -rw-r--r-- | fs/locks.c | 6 | ||||
| -rw-r--r-- | include/linux/fs.h | 5 |
2 files changed, 0 insertions, 11 deletions
diff --git a/fs/locks.c b/fs/locks.c index fd6e88bb9890..1a8c578e7ccd 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 { diff --git a/include/linux/fs.h b/include/linux/fs.h index 3d1cc5dd9a94..7bed389b9dfd 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1189,11 +1189,6 @@ extern long do_mount(char *, char *, char *, unsigned long, void *); extern int vfs_statfs(struct super_block *, struct kstatfs *); -/* Return value for VFS lock functions - tells locks.c to lock conventionally - * REALLY kosha for root NFS and nfs_lock - */ -#define LOCK_USE_CLNT 1 - #define FLOCK_VERIFY_READ 1 #define FLOCK_VERIFY_WRITE 2 |