From: J. Bruce Fields <bfields@fieldses.org>
Date: Tue, 3 Jan 2006 08:55:45 +0000 (+0100)
Subject: NLM: clean up nlmsvc_delete_block
X-Git-Tag: upstream/snapshot3+hdmi~44359^2~4^2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2c5acd2e1a73cad59203a1bace21e6b03f2920a9;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

NLM: clean up nlmsvc_delete_block

 The fl_next check here is superfluous (and possibly a layering violation).

 Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
 Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
index 5fb48b4..b56d439 100644
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@ -238,8 +238,7 @@ nlmsvc_delete_block(struct nlm_block *block, int unlock)
 
 	/* Remove block from list */
 	nlmsvc_remove_block(block);
-	if (fl->fl_next)
-		posix_unblock_lock(file->f_file, fl);
+	posix_unblock_lock(file->f_file, fl);
 
 	/* If the block is in the middle of a GRANT callback,
 	 * don't kill it yet. */