p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lustre: Deletion of unnecessary checks before three function calls 

The functions free_ll_remote_perm(), free_rmtperm_hash() and iput() test
whether their argument is NULL and then return immediately.
Thus the test around their calls is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Markus Elfring 2014-12-02 11:40:33 +01:00 committed by Greg Kroah-Hartman
parent 450b31a9d0
commit 13cb076d30
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/lustre/lustre/llite/remote_perm.c
View File

@ -194,7 +194,7 @@ int ll_update_remote_perm(struct inode *inode, struct mdt_remote_perm *perm)
if (!lli->lli_remote_perms)
lli->lli_remote_perms = perm_hash;
else if (perm_hash)
else
free_rmtperm_hash(perm_hash);
head = lli->lli_remote_perms + remote_perm_hashfunc(perm->rp_uid);
@ -209,8 +209,7 @@ int ll_update_remote_perm(struct inode *inode, struct mdt_remote_perm *perm)
continue;
if (tmp->lrp_fsgid != perm->rp_fsgid)
continue;
if (lrp)
free_ll_remote_perm(lrp);
free_ll_remote_perm(lrp);
lrp = tmp;
break;
}

3
drivers/staging/lustre/lustre/llite/statahead.c
View File

@ -334,8 +334,7 @@ static void ll_sa_entry_put(struct ll_statahead_info *sai,
LASSERT(ll_sa_entry_unhashed(entry));
ll_sa_entry_cleanup(sai, entry);
if (entry->se_inode)
iput(entry->se_inode);
iput(entry->se_inode);
OBD_FREE(entry, entry->se_size);
atomic_dec(&sai->sai_cache_count);