LU-2760 ldiskfs: update rhel6.3 series to handle mkdir errors

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / rhel6.3 / ext4_pdirop.patch

diff --git a/ldiskfs/kernel_patches/patches/rhel6.3/ext4_pdirop.patch b/ldiskfs/kernel_patches/patches/rhel6.3/ext4_pdirop.patch
index 029f549..dbd6a8e 100644 (file)
--- a/ldiskfs/kernel_patches/patches/rhel6.3/ext4_pdirop.patch
+++ b/ldiskfs/kernel_patches/patches/rhel6.3/ext4_pdirop.patch
@@ -2167,9 +2167,9 @@
  
 -      err = ext4_add_entry(handle, dentry, inode);
 +      err = ext4_add_entry(handle, dentry, inode, NULL);
-       if (err) {
-               clear_nlink(inode);
-               unlock_new_inode(inode);
+       if (err)
+               goto out_clear_inode;
+       ext4_inc_count(handle, dir);
 @@ -2381,7 +2789,7 @@ static int ext4_rmdir(struct inode *dir,
                return PTR_ERR(handle);