summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2013-04-10 15:36:48 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2013-04-10 15:40:31 -0400
commit314d7cc05d10208d6e63b0b1185f02c73a16adfb (patch)
tree5301aa541690afe59694e4d4226c778990b9eef8 /fs/nfs
parent7a8203d8cbab63b7c556ebd00e12685a3ed176b5 (diff)
downloadlinux-314d7cc05d10208d6e63b0b1185f02c73a16adfb.tar.bz2
nfs: remove unnecessary check for NULL inode->i_flock from nfs_delegation_claim_locks
The second check was added in commit 65b62a29 but it will never be true. Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/delegation.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c
index f30bd1ec63b9..57db3244f4d9 100644
--- a/fs/nfs/delegation.c
+++ b/fs/nfs/delegation.c
@@ -71,10 +71,8 @@ static int nfs_delegation_claim_locks(struct nfs_open_context *ctx, struct nfs4_
int status = 0;
if (inode->i_flock == NULL)
- return 0;
-
- if (inode->i_flock == NULL)
goto out;
+
/* Protect inode->i_flock using the file locks lock */
lock_flocks();
for (fl = inode->i_flock; fl != NULL; fl = fl->fl_next) {