LU-11922 ldiskfs: make dirdata work with metadata_csum

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / ubuntu14+16 / ext4-pdirop-001.patch

diff --git a/ldiskfs/kernel_patches/patches/ubuntu14+16/ext4-pdirop-001.patch b/ldiskfs/kernel_patches/patches/ubuntu14+16/ext4-pdirop-001.patch
index ad8800f..aa0bf6e 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ubuntu14+16/ext4-pdirop-001.patch
+++ b/ldiskfs/kernel_patches/patches/ubuntu14+16/ext4-pdirop-001.patch
@@ -1668,7 +1668,7 @@ index 2543b8f..e70b61a 100644
                            dx_get_limit((frame - 1)->entries)) {
 @@ -2472,8 +2818,32 @@ again:
                        restart = 1;
-                       goto cleanup;
+                       goto journal_error;
                }
 +      } else if (!ext4_htree_dx_locked(lck)) {
 +              struct ext4_dir_lock_data *ld = ext4_htree_lock_data(lck);
@@ -1702,7 +1702,7 @@ index 2543b8f..e70b61a 100644
                goto cleanup;
 @@ -2484,6 +2854,8 @@ again:
  journal_error:
-       ext4_std_error(dir->i_sb, err);
+       ext4_std_error(dir->i_sb, err); /* this is a no-op if err == 0 */
  cleanup:
 +      ext4_htree_dx_unlock(lck);
 +      ext4_htree_de_unlock(lck);