Re: [PATCH] ntfs: Deletion of unnecessary checks before the function call "iput"

[Anton Altaparmakov]

Hi Andrew,

Can you please take up this trivial patch and merge it upstream?

Reviewed-by: Anton Altaparmakov <anton@xxxxxxxxxx>

Thanks a lot in advance!

Best regards,

	Anton

> On 4 Jul 2015, at 11:32, SF Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx> wrote:
> 
>> From: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
>> Date: Sat, 15 Nov 2014 19:35:05 +0100
>> 
>> The iput() function tests whether its argument is NULL and then
>> returns immediately. Thus the test around the call is not needed.
>> 
>> This issue was detected by using the Coccinelle software.
>> 
>> Signed-off-by: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
>> ---
>> fs/ntfs/super.c | 21 +++++++--------------
>> 1 file changed, 7 insertions(+), 14 deletions(-)
>> 
>> diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
>> index 6c3296e..8f22a47 100644
>> --- a/fs/ntfs/super.c
>> +++ b/fs/ntfs/super.c
>> @@ -2204,17 +2204,12 @@ get_ctx_vol_failed:
>> 	return true;
>> #ifdef NTFS_RW
>> iput_usnjrnl_err_out:
>> -	if (vol->usnjrnl_j_ino)
>> -		iput(vol->usnjrnl_j_ino);
>> -	if (vol->usnjrnl_max_ino)
>> -		iput(vol->usnjrnl_max_ino);
>> -	if (vol->usnjrnl_ino)
>> -		iput(vol->usnjrnl_ino);
>> +	iput(vol->usnjrnl_j_ino);
>> +	iput(vol->usnjrnl_max_ino);
>> +	iput(vol->usnjrnl_ino);
>> iput_quota_err_out:
>> -	if (vol->quota_q_ino)
>> -		iput(vol->quota_q_ino);
>> -	if (vol->quota_ino)
>> -		iput(vol->quota_ino);
>> +	iput(vol->quota_q_ino);
>> +	iput(vol->quota_ino);
>> 	iput(vol->extend_ino);
>> #endif /* NTFS_RW */
>> iput_sec_err_out:
>> @@ -2223,8 +2218,7 @@ iput_root_err_out:
>> 	iput(vol->root_ino);
>> iput_logfile_err_out:
>> #ifdef NTFS_RW
>> -	if (vol->logfile_ino)
>> -		iput(vol->logfile_ino);
>> +	iput(vol->logfile_ino);
>> iput_vol_err_out:
>> #endif /* NTFS_RW */
>> 	iput(vol->vol_ino);
>> @@ -2254,8 +2248,7 @@ iput_mftbmp_err_out:
>> 	iput(vol->mftbmp_ino);
>> iput_mirr_err_out:
>> #ifdef NTFS_RW
>> -	if (vol->mftmirr_ino)
>> -		iput(vol->mftmirr_ino);
>> +	iput(vol->mftmirr_ino);
>> #endif /* NTFS_RW */
>> 	return false;
>> }
>> 
> 
> Would you like to integrate this update suggestion
> into another source code repository?
> 
> Regards,
> Markus

-- 
Anton Altaparmakov <anton at tuxera.com> (replace at with @)
Lead in File System Development, Tuxera Inc., http://www.tuxera.com/
Linux NTFS maintainer

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/