From 9bd769e74d9139e3d42b682eaf26466764c78f09 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Tue, 1 Apr 2008 20:26:52 -0400 Subject: [PATCH] --- yaml --- r: 92922 b: refs/heads/master c: c4d7c402b788b73dc24f1e54a57f89d3dc5eb7bc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfs/file.c | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index ba58c9cbef91..4814a320073d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f50c0c6d644d6c8180d9079c13c5d9de3adeb34 +refs/heads/master: c4d7c402b788b73dc24f1e54a57f89d3dc5eb7bc diff --git a/trunk/fs/nfs/file.c b/trunk/fs/nfs/file.c index 10e8b807e7ff..742cb745cb47 100644 --- a/trunk/fs/nfs/file.c +++ b/trunk/fs/nfs/file.c @@ -566,17 +566,9 @@ static int do_setlk(struct file *filp, int cmd, struct file_lock *fl) lock_kernel(); /* Use local locking if mounted with "-onolock" */ - if (!(NFS_SERVER(inode)->flags & NFS_MOUNT_NONLM)) { + if (!(NFS_SERVER(inode)->flags & NFS_MOUNT_NONLM)) status = NFS_PROTO(inode)->lock(filp, cmd, fl); - /* If we were signalled we still need to ensure that - * we clean up any state on the server. We therefore - * record the lock call as having succeeded in order to - * ensure that locks_remove_posix() cleans it out when - * the process exits. - */ - if (status == -EINTR || status == -ERESTARTSYS) - do_vfs_lock(filp, fl); - } else + else status = do_vfs_lock(filp, fl); unlock_kernel(); if (status < 0)