Commit 816a8800 authored by Long Li's avatar Long Li Committed by Andrew Morton
Browse files

ocfs2: remove redundant NULL check in rename path 

The code checks newfe_bh for NULL after it has already been dereferenced
to access b_data.  This NULL check is unnecessary for two reasons:

1. If ocfs2_inode_lock() succeeds (returns >= 0), newfe_bh is guaranteed
   to be valid.
2. We've already dereferenced newfe_bh to access b_data, so it must be
   non-NULL at this point.

Remove the redundant NULL check in the trace_ocfs2_rename_over_existing()
call to improve code clarity.

Link: https://lkml.kernel.org/r/20250617012534.3458669-1-leo.lilong@huawei.com


Signed-off-by: default avatarLong Li <leo.lilong@huawei.com>
Reviewed-by: default avatarSu Yue <glass.su@suse.com>
Reviewed-by: default avatarJoseph Qi <joseph.qi@linux.alibaba.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Jun Piao <piaojun@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 2ae82679

fs/ocfs2/namei.c

+2 −2
Original line number Diff line number Diff line
@@ -1452,8 +1452,8 @@ static int ocfs2_rename(struct mnt_idmap *idmap, 
		newfe = (struct ocfs2_dinode *) newfe_bh->b_data;



		trace_ocfs2_rename_over_existing(

		     (unsigned long long)newfe_blkno, newfe_bh, newfe_bh ?

		     (unsigned long long)newfe_bh->b_blocknr : 0ULL);

		     (unsigned long long)newfe_blkno, newfe_bh,

		     (unsigned long long)newfe_bh->b_blocknr);



		if (S_ISDIR(new_inode->i_mode) || (new_inode->i_nlink == 1)) {

			status = ocfs2_prepare_orphan_dir(osb, &orphan_dir,