Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72865d92 authored by Joseph Qi's avatar Joseph Qi Committed by Linus Torvalds
Browse files

ocfs2: clean up redundant NULL check before iput 



Since iput will take care the NULL check itself, NULL check before
calling it is redundant.  So clean them up.

Signed-off-by: default avatarJoseph Qi <joseph.qi@huawei.com>
Cc: Mark Fasheh <mfasheh@suse.de>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b5560143

fs/ocfs2/alloc.c

+1 −2
Original line number Diff line number Diff line
@@ -6174,7 +6174,6 @@ int ocfs2_begin_truncate_log_recovery(struct ocfs2_super *osb, 
	}



bail:

	if (tl_inode)

	iput(tl_inode);

	brelse(tl_bh);

fs/ocfs2/ioctl.c

+1 −3
Original line number Diff line number Diff line
@@ -606,9 +606,7 @@ static int ocfs2_info_freefrag_scan_bitmap(struct ocfs2_super *osb, 
	if (gb_inode)

		mutex_unlock(&gb_inode->i_mutex);



	if (gb_inode)

	iput(gb_inode);



	brelse(bh);



	return status;

fs/ocfs2/journal.c

+3 −7
Original line number Diff line number Diff line
@@ -1042,7 +1042,6 @@ void ocfs2_journal_shutdown(struct ocfs2_super *osb) 


//	up_write(&journal->j_trans_barrier);

done:

	if (inode)

	iput(inode);

}
@@ -1687,9 +1686,7 @@ static int ocfs2_replay_journal(struct ocfs2_super *osb, 
	if (got_lock)

		ocfs2_inode_unlock(inode, 1);



	if (inode)

	iput(inode);



	brelse(bh);



	return status;
@@ -1796,7 +1793,6 @@ static int ocfs2_trylock_journal(struct ocfs2_super *osb, 


	ocfs2_inode_unlock(inode, 1);

bail:

	if (inode)

	iput(inode);



	return status;

fs/ocfs2/localalloc.c

+3 −7
Original line number Diff line number Diff line
@@ -358,7 +358,6 @@ int ocfs2_load_local_alloc(struct ocfs2_super *osb) 
bail:

	if (status < 0)

		brelse(alloc_bh);

	if (inode)

	iput(inode);



	trace_ocfs2_load_local_alloc(osb->local_alloc_bits);
@@ -473,7 +472,6 @@ void ocfs2_shutdown_local_alloc(struct ocfs2_super *osb) 
	iput(main_bm_inode);



out:

	if (local_alloc_inode)

	iput(local_alloc_inode);



	kfree(alloc_copy);
@@ -1327,9 +1325,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb, 


	brelse(main_bm_bh);



	if (main_bm_inode)

	iput(main_bm_inode);



	kfree(alloc_copy);



	if (ac)

fs/ocfs2/namei.c

+1 −2
Original line number Diff line number Diff line
@@ -1683,7 +1683,6 @@ static int ocfs2_rename(struct inode *old_dir, 
	if (new_inode)

		sync_mapping_buffers(old_inode->i_mapping);



	if (new_inode)

	iput(new_inode);



	ocfs2_free_dir_lookup_result(&target_lookup_res);