Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: Long Li <leo.lilong@huawei.com>
Reviewed-by: Su Yue <glass.su@suse.com>
Reviewed-by: Joseph 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: Andrew Morton <akpm@linux-foundation.org>

authored by

Long Li and committed by
Andrew Morton
816a8800 2ae82679

+2 -2
+2 -2
fs/ocfs2/namei.c
··· 1452 1452 newfe = (struct ocfs2_dinode *) newfe_bh->b_data; 1453 1453 1454 1454 trace_ocfs2_rename_over_existing( 1455 - (unsigned long long)newfe_blkno, newfe_bh, newfe_bh ? 1456 - (unsigned long long)newfe_bh->b_blocknr : 0ULL); 1455 + (unsigned long long)newfe_blkno, newfe_bh, 1456 + (unsigned long long)newfe_bh->b_blocknr); 1457 1457 1458 1458 if (S_ISDIR(new_inode->i_mode) || (new_inode->i_nlink == 1)) { 1459 1459 status = ocfs2_prepare_orphan_dir(osb, &orphan_dir,