VFS: Remove LOCK_USE_CLNT. It should no longer be necessary. Signed-off-by: Trond Myklebust --- fs/locks.c | 6 ------ include/linux/fs.h | 5 ----- 2 files changed, 11 deletions(-) Index: linux-2.6.9-rc4-up/include/linux/fs.h =================================================================== --- linux-2.6.9-rc4-up.orig/include/linux/fs.h 2004-10-15 12:03:03.000000000 +0200 +++ linux-2.6.9-rc4-up/include/linux/fs.h 2004-10-15 17:04:10.645827518 +0200 @@ -1167,11 +1167,6 @@ extern long do_mount(char *, char *, cha 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 Index: linux-2.6.9-rc4-up/fs/locks.c =================================================================== --- linux-2.6.9-rc4-up.orig/fs/locks.c 2004-10-15 12:04:18.000000000 +0200 +++ linux-2.6.9-rc4-up/fs/locks.c 2004-10-15 17:03:16.376966402 +0200 @@ -1435,9 +1435,6 @@ int fcntl_getlk(struct file *filp, struc 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 { @@ -1580,9 +1577,6 @@ int fcntl_getlk64(struct file *filp, str 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 {