aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@fieldses.org>2006-01-03 03:55:45 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-01-06 14:58:54 -0500
commit2c5acd2e1a73cad59203a1bace21e6b03f2920a9 (patch)
tree8fbd8725f4ca96c1d77d3c00a5756beaf5fa8abc
parent5996a298da43a03081e9ba2116983d173001c862 (diff)
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>
-rw-r--r--fs/lockd/svclock.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
index 5fb48b4390bd..b56d439bad82 100644
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@ -238,8 +238,7 @@ nlmsvc_delete_block(struct nlm_block *block, int unlock)
238 238
239 /* Remove block from list */ 239 /* Remove block from list */
240 nlmsvc_remove_block(block); 240 nlmsvc_remove_block(block);
241 if (fl->fl_next) 241 posix_unblock_lock(file->f_file, fl);
242 posix_unblock_lock(file->f_file, fl);
243 242
244 /* If the block is in the middle of a GRANT callback, 243 /* If the block is in the middle of a GRANT callback,
245 * don't kill it yet. */ 244 * don't kill it yet. */