From: Jeff Layton <jlayton@redhat.com>
Date: Wed, 10 Apr 2013 19:36:48 +0000 (-0400)
Subject: nfs: remove unnecessary check for NULL inode->i_flock from nfs_delegation_claim_locks
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=314d7cc05d10208d6e63b0b1185f02c73a16adfb;p=openwrt%2Fstaging%2Fblogic.git

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>
---

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
@@ -70,11 +70,9 @@ static int nfs_delegation_claim_locks(struct nfs_open_context *ctx, struct nfs4_
 	struct file_lock *fl;
 	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) {