LU-7315 osd-ldiskfs: handle pdo lock properly

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

diff --git a/ldiskfs/kernel_patches/patches/sles12/ext4-pdirop.patch b/ldiskfs/kernel_patches/patches/sles12/ext4-pdirop.patch
index 2ff2e23..6ae7e71 100644 (file)
--- a/ldiskfs/kernel_patches/patches/sles12/ext4-pdirop.patch
+++ b/ldiskfs/kernel_patches/patches/sles12/ext4-pdirop.patch
@@ -1490,7 +1490,7 @@ Index: linux-3.10.0-229.1.2.fc21.x86_64/fs/ext4/namei.c
 +                                 struct dx_entry *entries,
 +                                 struct dx_entry *at, u32 hash)
 +{
-+      if (!(ext4_htree_lock_data(lck)->ld_flags & EXT4_LB_EXACT)) {
++      if (!(lck && ext4_htree_lock_data(lck)->ld_flags & EXT4_LB_EXACT)) {
 +              return DX_HASH_COL_IGNORE; /* don't care about collision */
 +
 +      } else if (at == entries + dx_get_count(entries) - 1) {