LU-17711 osd-ldiskfs: do not delete dotdot during rename

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / rhel8.7 / ext4-pdirop.patch

diff --git a/ldiskfs/kernel_patches/patches/rhel8.7/ext4-pdirop.patch b/ldiskfs/kernel_patches/patches/rhel8.7/ext4-pdirop.patch
index 2da3d4d..450e821 100644 (file)
--- a/ldiskfs/kernel_patches/patches/rhel8.7/ext4-pdirop.patch
+++ b/ldiskfs/kernel_patches/patches/rhel8.7/ext4-pdirop.patch
@@ -775,9 +775,9 @@ Index: linux-4.18.0-423.el8/fs/ext4/namei.c
        struct inode *dir = d_inode(dentry->d_parent);
        struct buffer_head *bh = NULL;
 @@ -2307,9 +2648,10 @@ static int ext4_add_entry(handle_t *hand
-               if (dentry->d_name.len == 2 &&
-                    memcmp(dentry->d_name.name, "..", 2) == 0)
-                        return ext4_update_dotdot(handle, dentry, inode);
+               return ext4_update_dotdot(handle, dentry, inode);
+ 
+       if (is_dx(dir)) {
 -              retval = ext4_dx_add_entry(handle, &fname, dir, inode);
 +              retval = ext4_dx_add_entry(handle, &fname, dir, inode, lck);
                if (!retval || (retval != ERR_BAD_DX_DIR))