android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lockd: remove redundant check on block

Browse Source 
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>
This commit is contained in:
Colin Ian King 2017-04-08 18:09:59 +01:00 committed by J. Bruce Fields
parent dadf3e435d
commit e56efe9322
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/lockd/svclock.c
View File

@ -870,15 +870,15 @@ nlmsvc_grant_reply(struct nlm_cookie *cookie, __be32 status)
if (!(block = nlmsvc_find_block(cookie))) if (!(block = nlmsvc_find_block(cookie)))
return; return;
if (block) { if (status == nlm_lck_denied_grace_period) {
if (status == nlm_lck_denied_grace_period) { /* Try again in a couple of seconds */
/* Try again in a couple of seconds */ nlmsvc_insert_block(block, 10 * HZ);
nlmsvc_insert_block(block, 10 * HZ); } else {
} else { /*
/* Lock is now held by client, or has been rejected. * Lock is now held by client, or has been rejected.
* In both cases, the block should be removed. */ * In both cases, the block should be removed.
nlmsvc_unlink_block(block); */
} nlmsvc_unlink_block(block);
} }
nlmsvc_release_block(block); nlmsvc_release_block(block);
} }