aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ntfs
diff options
context:
space:
mode:
authorSF Markus Elfring <elfring@users.sourceforge.net>2015-09-04 18:43:32 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2015-09-04 19:54:41 -0400
commit917520e100e1db5e8dd546dd94fef070a31652a5 (patch)
treea7a2ebd2b26344ee276caa04072ee9339bf2678e /fs/ntfs
parent35108d71383c5f4abc286430c0b5da79d22553f9 (diff)
ntfs: delete unnecessary checks before calling iput()
iput() 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@users.sourceforge.net> Cc: Julia Lawall <julia.lawall@lip6.fr> Reviewed-by: Anton Altaparmakov <anton@tuxera.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ntfs')
-rw-r--r--fs/ntfs/super.c21
1 files changed, 7 insertions, 14 deletions
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
index c1128bcbeb5e..d1a853585b53 100644
--- a/fs/ntfs/super.c
+++ b/fs/ntfs/super.c
@@ -2204,17 +2204,12 @@ get_ctx_vol_failed:
2204 return true; 2204 return true;
2205#ifdef NTFS_RW 2205#ifdef NTFS_RW
2206iput_usnjrnl_err_out: 2206iput_usnjrnl_err_out:
2207 if (vol->usnjrnl_j_ino) 2207 iput(vol->usnjrnl_j_ino);
2208 iput(vol->usnjrnl_j_ino); 2208 iput(vol->usnjrnl_max_ino);
2209 if (vol->usnjrnl_max_ino) 2209 iput(vol->usnjrnl_ino);
2210 iput(vol->usnjrnl_max_ino);
2211 if (vol->usnjrnl_ino)
2212 iput(vol->usnjrnl_ino);
2213iput_quota_err_out: 2210iput_quota_err_out:
2214 if (vol->quota_q_ino) 2211 iput(vol->quota_q_ino);
2215 iput(vol->quota_q_ino); 2212 iput(vol->quota_ino);
2216 if (vol->quota_ino)
2217 iput(vol->quota_ino);
2218 iput(vol->extend_ino); 2213 iput(vol->extend_ino);
2219#endif /* NTFS_RW */ 2214#endif /* NTFS_RW */
2220iput_sec_err_out: 2215iput_sec_err_out:
@@ -2223,8 +2218,7 @@ iput_root_err_out:
2223 iput(vol->root_ino); 2218 iput(vol->root_ino);
2224iput_logfile_err_out: 2219iput_logfile_err_out:
2225#ifdef NTFS_RW 2220#ifdef NTFS_RW
2226 if (vol->logfile_ino) 2221 iput(vol->logfile_ino);
2227 iput(vol->logfile_ino);
2228iput_vol_err_out: 2222iput_vol_err_out:
2229#endif /* NTFS_RW */ 2223#endif /* NTFS_RW */
2230 iput(vol->vol_ino); 2224 iput(vol->vol_ino);
@@ -2254,8 +2248,7 @@ iput_mftbmp_err_out:
2254 iput(vol->mftbmp_ino); 2248 iput(vol->mftbmp_ino);
2255iput_mirr_err_out: 2249iput_mirr_err_out:
2256#ifdef NTFS_RW 2250#ifdef NTFS_RW
2257 if (vol->mftmirr_ino) 2251 iput(vol->mftmirr_ino);
2258 iput(vol->mftmirr_ino);
2259#endif /* NTFS_RW */ 2252#endif /* NTFS_RW */
2260 return false; 2253 return false;
2261} 2254}