summaryrefslogtreecommitdiffstats
path: root/fs/lockd
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2017-04-08 18:09:59 +0100
committerJ. Bruce Fields <bfields@redhat.com>2017-04-25 17:25:56 -0400
commite56efe9322c5bec9ad4f301c8102fcd630694b4c (patch)
tree637506d4743c9808db8612d962fdaf7e9c19ac14 /fs/lockd
parentdadf3e435debb85dfcf28c157012047153a21a97 (diff)
downloadlinux-stable-e56efe9322c5bec9ad4f301c8102fcd630694b4c.tar.gz
linux-stable-e56efe9322c5bec9ad4f301c8102fcd630694b4c.tar.bz2
linux-stable-e56efe9322c5bec9ad4f301c8102fcd630694b4c.zip
lockd: remove redundant check on block
A null check followed by a return is being performed already, so block is always non-null at the second check on block, hence we can remove this redundant null-check (Detected by PVS-Studio). Also re-work comment to clean up a check-patch warning. Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/lockd')
-rw-r--r--fs/lockd/svclock.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
index 5581e020644b..3507c80d1d4b 100644
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@ -870,15 +870,15 @@ nlmsvc_grant_reply(struct nlm_cookie *cookie, __be32 status)
if (!(block = nlmsvc_find_block(cookie)))
return;
- if (block) {
- if (status == nlm_lck_denied_grace_period) {
- /* Try again in a couple of seconds */
- nlmsvc_insert_block(block, 10 * HZ);
- } else {
- /* Lock is now held by client, or has been rejected.
- * In both cases, the block should be removed. */
- nlmsvc_unlink_block(block);
- }
+ if (status == nlm_lck_denied_grace_period) {
+ /* Try again in a couple of seconds */
+ nlmsvc_insert_block(block, 10 * HZ);
+ } else {
+ /*
+ * Lock is now held by client, or has been rejected.
+ * In both cases, the block should be removed.
+ */
+ nlmsvc_unlink_block(block);
}
nlmsvc_release_block(block);
}