| From: Long Li <leo.lilong@huawei.com> |
| Subject: ocfs2: remove redundant NULL check in rename path |
| Date: Tue, 17 Jun 2025 09:25:34 +0800 |
| |
| 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> |
| --- |
| |
| fs/ocfs2/namei.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/fs/ocfs2/namei.c~ocfs2-remove-redundant-null-check-in-rename-path |
| +++ a/fs/ocfs2/namei.c |
| @@ -1452,8 +1452,8 @@ static int ocfs2_rename(struct mnt_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, |
| _ |
