Re: [PATCH] NFS nolock broken in 2.6.9-rc4

[Olaf Kirch <okir@suse.de>]

[-- Attachment #1: Type: text/plain, Size: 626 bytes --]

On Fri, Oct 15, 2004 at 11:58:40AM +0200, Olaf Kirch wrote:
> I don't know why this change was made. The patch below simply reverts
> these two hunks; maybe there's a better solution involving LOCK_USE_CLNT
> the way it's used for F_GETLK at the moment.

I forgot to add the patch. Below there are two possible fixes.

 fix1: just revert the changes

 fix2: use LOCK_USE_CLNT for all locking operations if mounted nolock.

The second one is probably better...

Olaf
-- 
Olaf Kirch     | Things that make Monday morning interesting, #1:
okir@suse.de   |        "I want to use NFS over AX25, can you help me?"
---------------+ 

[-- Attachment #2: nfs-nolock-fix1 --]
[-- Type: text/plain, Size: 929 bytes --]

Index: linux-2.6.9-rc4/fs/locks.c
===================================================================
--- linux-2.6.9-rc4.orig/fs/locks.c
+++ linux-2.6.9-rc4/fs/locks.c
@@ -1534,7 +1534,8 @@ int fcntl_setlk(struct file *filp, unsig
 
 	if (filp->f_op && filp->f_op->lock != NULL) {
 		error = filp->f_op->lock(filp, cmd, file_lock);
-		goto out;
+		if (error < 0)
+			goto out;
 	}
 
 	for (;;) {
@@ -1668,7 +1669,8 @@ int fcntl_setlk64(struct file *filp, uns
 
 	if (filp->f_op && filp->f_op->lock != NULL) {
 		error = filp->f_op->lock(filp, cmd, file_lock);
-		goto out;
+		if (error < 0)
+			goto out;
 	}
 
 	for (;;) {
@@ -1720,7 +1722,7 @@ void locks_remove_posix(struct file *fil
 
 	if (filp->f_op && filp->f_op->lock != NULL) {
 		filp->f_op->lock(filp, F_SETLK, &lock);
-		goto out;
+		/* Ignore any error -- we must remove the locks anyway */
 	}
 
 	/* Can't use posix_lock_file here; we need to remove it no matter

[-- Attachment #3: nfs-nolock-fix2 --]
[-- Type: text/plain, Size: 1836 bytes --]


A previous change broke locking on NFS file systems mounted -o nolock.
This patch fixes the problem by making all NFS lock calls return
LOCK_USE_CLNT in this case, and treating it the way we did previously.

Signed-off-by: Olaf Kirch <okir@suse.de>

Index: linux-2.6.9-rc4/fs/locks.c
===================================================================
--- linux-2.6.9-rc4.orig/fs/locks.c
+++ linux-2.6.9-rc4/fs/locks.c
@@ -1534,7 +1534,8 @@ int fcntl_setlk(struct file *filp, unsig
 
 	if (filp->f_op && filp->f_op->lock != NULL) {
 		error = filp->f_op->lock(filp, cmd, file_lock);
-		goto out;
+		if (error != LOCK_USE_CLNT)
+			goto out;
 	}
 
 	for (;;) {
@@ -1668,7 +1669,8 @@ int fcntl_setlk64(struct file *filp, uns
 
 	if (filp->f_op && filp->f_op->lock != NULL) {
 		error = filp->f_op->lock(filp, cmd, file_lock);
-		goto out;
+		if (error != LOCK_USE_CLNT)
+			goto out;
 	}
 
 	for (;;) {
@@ -1719,8 +1721,9 @@ void locks_remove_posix(struct file *fil
 	lock.fl_lmops = NULL;
 
 	if (filp->f_op && filp->f_op->lock != NULL) {
-		filp->f_op->lock(filp, F_SETLK, &lock);
-		goto out;
+		error = filp->f_op->lock(filp, F_SETLK, &lock);
+		if (error != LOCK_USE_CLNT)
+			goto out;
 	}
 
 	/* Can't use posix_lock_file here; we need to remove it no matter
Index: linux-2.6.9-rc4/fs/nfs/file.c
===================================================================
--- linux-2.6.9-rc4.orig/fs/nfs/file.c
+++ linux-2.6.9-rc4/fs/nfs/file.c
@@ -397,11 +397,9 @@ nfs_lock(struct file *filp, int cmd, str
 		return -ENOLCK;
 
 	if (NFS_PROTO(inode)->version != 4) {
-		/* Fake OK code if mounted without NLM support */
+		/* If mounted NONLM, tell VFS to use local locking only. */
 		if (NFS_SERVER(inode)->flags & NFS_MOUNT_NONLM) {
-			if (IS_GETLK(cmd))
-				return LOCK_USE_CLNT;
-			return 0;
+			return LOCK_USE_CLNT;
 		}
 	}