b=20150

i=adilger
i=johann

fix locking typo - from upstream
not present in ext3-ldiskfs

diff --git a/ldiskfs/kernel_patches/patches/ext4-pa_lock-typo.patch b/ldiskfs/kernel_patches/patches/ext4-pa_lock-typo.patch
new file mode 100644 (file)
index 0000000..6c10882
--- /dev/null
+++ b/ldiskfs/kernel_patches/patches/ext4-pa_lock-typo.patch
@@ -0,0 +1,13 @@
+Index: linux-2.6.18-128.1.6/fs/ext4/mballoc.c
+===================================================================
+--- linux-2.6.18-128.1.6.orig/fs/ext4/mballoc.c
++++ linux-2.6.18-128.1.6/fs/ext4/mballoc.c
+@@ -4507,7 +4507,7 @@ static void ext4_mb_add_n_trim(struct ex
+                                               pa_inode_list) {
+               spin_lock(&tmp_pa->pa_lock);
+               if (tmp_pa->pa_deleted) {
+-                      spin_unlock(&pa->pa_lock);
++                      spin_unlock(&tmp_pa->pa_lock);
+                       continue;
+               }
+               if (!added && pa->pa_free < tmp_pa->pa_free) {

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5-ext4.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5-ext4.series
index 17bc785..fe0e9a7 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5-ext4.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5-ext4.series
@@ -22,3 +22,4 @@ ext4-misc-rhel5.patch
 ext4-convert-group-lock-rhel5.patch
 ext4-force_over_8tb-rhel5.patch
 ext4_ext_search_right-fix.patch
 ext4-convert-group-lock-rhel5.patch
 ext4-force_over_8tb-rhel5.patch
 ext4_ext_search_right-fix.patch

+ext4-pa_lock-typo.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series
index 5669b49..1066568 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series
@@ -26,3 +26,4 @@ ext4-convert-group-lock-sles11.patch
 ext4-force_over_8tb-sles11.patch
 ext4-claim_inode-free_inode-race.patch
 ext4_ext_search_right-fix.patch
 ext4-force_over_8tb-sles11.patch
 ext4-claim_inode-free_inode-race.patch
 ext4_ext_search_right-fix.patch

+ext4-pa_lock-typo.patch