From: J. Bruce Fields Date: Tue, 3 Jan 2006 08:55:45 +0000 (+0100) Subject: NLM: clean up nlmsvc_delete_block X-Git-Tag: v2.6.16-rc1~935^2~4^2~16 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c5acd2e1a73cad59203a1bace21e6b03f2920a9;p=linux-2.6 NLM: clean up nlmsvc_delete_block The fl_next check here is superfluous (and possibly a layering violation). Signed-off-by: J. Bruce Fields Signed-off-by: Trond Myklebust --- diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index 5fb48b4390..b56d439bad 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. */