hc
2024-09-20 cf4ce59b3b70238352c7f1729f0f7223214828ad
kernel/fs/udf/namei.c
....@@ -1090,8 +1090,9 @@
10901090 return -EINVAL;
10911091
10921092 ofi = udf_find_entry(old_dir, &old_dentry->d_name, &ofibh, &ocfi);
1093
- if (IS_ERR(ofi)) {
1094
- retval = PTR_ERR(ofi);
1093
+ if (!ofi || IS_ERR(ofi)) {
1094
+ if (IS_ERR(ofi))
1095
+ retval = PTR_ERR(ofi);
10951096 goto end_rename;
10961097 }
10971098
....@@ -1100,8 +1101,7 @@
11001101
11011102 brelse(ofibh.sbh);
11021103 tloc = lelb_to_cpu(ocfi.icb.extLocation);
1103
- if (!ofi || udf_get_lb_pblock(old_dir->i_sb, &tloc, 0)
1104
- != old_inode->i_ino)
1104
+ if (udf_get_lb_pblock(old_dir->i_sb, &tloc, 0) != old_inode->i_ino)
11051105 goto end_rename;
11061106
11071107 nfi = udf_find_entry(new_dir, &new_dentry->d_name, &nfibh, &ncfi);