ChangeSet 1.2094, 2005/02/22 20:22:00-08:00, [EMAIL PROTECTED]
[PATCH] NFS: Further fixes for the -onolock case.
Duh... GETLK returns F_UNLCK if and only if the lock could be placed.
Signed-off-by: Trond Myklebust <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
file.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff -Nru a/fs/nfs/file.c b/fs/nfs/file.c
--- a/fs/nfs/file.c 2005-02-22 21:06:00 -08:00
+++ b/fs/nfs/file.c 2005-02-22 21:06:00 -08:00
@@ -303,10 +303,10 @@
status = NFS_PROTO(inode)->lock(filp, cmd, fl);
else {
struct file_lock *cfl = posix_test_lock(filp, fl);
- if (cfl != NULL) {
+
+ fl->fl_type = F_UNLCK;
+ if (cfl != NULL)
memcpy(fl, cfl, sizeof(*fl));
- fl->fl_type = F_UNLCK;
- }
}
unlock_kernel();
return status;
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
