From 8f7181ee5553aa22ecfe51202f3db1a4162361e7 Mon Sep 17 00:00:00 2001 From: Niu Yawei Date: Tue, 20 Jan 2015 04:51:54 -0500 Subject: [PATCH] LU-5726 ldiskfs: missed brelse() in large EA patch brelse() is missed in ldiskfs_xattr_delete_inode(), this defect is introduced by the ldiskfs large EA patch. Lustre-commit: 09ab9d084884d8624e10ce49eeb0ed9f41451cea Lustre-change: http://review.whamcloud.com/#/c/13452/ Signed-off-by: Niu Yawei Change-Id: I506dd93dd8a5e62b233be71083a392d4f35dac8e Reviewed-on: http://review.whamcloud.com/13464 Tested-by: Jenkins Reviewed-by: James Simmons Tested-by: Maloo Reviewed-by: Andreas Dilger --- ldiskfs/kernel_patches/patches/rhel6.3/ext4-large-eas.patch | 3 ++- ldiskfs/kernel_patches/patches/sles11sp2/ext4-large-eas.patch | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ldiskfs/kernel_patches/patches/rhel6.3/ext4-large-eas.patch b/ldiskfs/kernel_patches/patches/rhel6.3/ext4-large-eas.patch index 6c7802c..573a68d 100644 --- a/ldiskfs/kernel_patches/patches/rhel6.3/ext4-large-eas.patch +++ b/ldiskfs/kernel_patches/patches/rhel6.3/ext4-large-eas.patch @@ -623,7 +623,7 @@ Index: linux-stage/fs/ext4/xattr.c new_offs = le16_to_cpu(last->e_value_offs) + value_offs_shift; BUG_ON(new_offs + le32_to_cpu(last->e_value_size) -@@ -1353,15 +1664,41 @@ cleanup: +@@ -1353,15 +1664,42 @@ cleanup: /* * ext4_xattr_delete_inode() * @@ -662,6 +662,7 @@ Index: linux-stage/fs/ext4/xattr.c + entry->e_value_inum = 0; + } + } ++ brelse(iloc.bh); +delete_external_ea: if (!EXT4_I(inode)->i_file_acl) diff --git a/ldiskfs/kernel_patches/patches/sles11sp2/ext4-large-eas.patch b/ldiskfs/kernel_patches/patches/sles11sp2/ext4-large-eas.patch index 3a7e7c3..9ca6d12 100644 --- a/ldiskfs/kernel_patches/patches/sles11sp2/ext4-large-eas.patch +++ b/ldiskfs/kernel_patches/patches/sles11sp2/ext4-large-eas.patch @@ -636,7 +636,7 @@ diff -ur linux-stage.orig/fs/ext4/xattr.c linux-stage/fs/ext4/xattr.c new_offs = le16_to_cpu(last->e_value_offs) + value_offs_shift; BUG_ON(new_offs + le32_to_cpu(last->e_value_size) -@@ -1364,15 +1675,41 @@ +@@ -1364,15 +1675,42 @@ /* * ext4_xattr_delete_inode() * @@ -675,6 +675,7 @@ diff -ur linux-stage.orig/fs/ext4/xattr.c linux-stage/fs/ext4/xattr.c + entry->e_value_inum = 0; + } + } ++ brelse(iloc.bh); +delete_external_ea: if (!EXT4_I(inode)->i_file_acl) -- 1.8.3.1