[Pkg-lustre-maintainers] Add fix for bug13438

[Niklas Edmundsson]

I would suggesting adding the fix for bug 13438, we managed to trigger 
it rather quickly when testing inode creation.

Attached is a version adapted to pkg-lustre trunk, the only difference 
is a modified patch offset (patches of patches of patches are really 
ugly to look at by the way ;).

We're currently trying the fix in but 13614 to see if that one reduces 
the recovery-problem we discovered (rebooting all OSS's at the same 
time during load made lustre go kabloom upon recovery).

/Nikke
-- 
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
  Niklas Edmundsson, Admin @ {acc,hpc2n}.umu.se     |    nikke at hpc2n.umu.se
---------------------------------------------------------------------------
  CATHOLICISM: If shit happens, you deserve it.
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-------------- next part --------------
Index: trunk/debian/patches/bug13438-fix-mballoc-bogus-BUGON.dpatch
===================================================================
--- trunk/debian/patches/bug13438-fix-mballoc-bogus-BUGON.dpatch	(revision 0)
+++ trunk/debian/patches/bug13438-fix-mballoc-bogus-BUGON.dpatch	(revision 0)
@@ -0,0 +1,47 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: CFS bug 13438 - mballoc bogus BUG_ON
+
+ at DPATCH@
+diff -p -u -r1.1.4.2 ext3-mballoc3-core.patch
+--- ./ldiskfs/kernel_patches/patches/ext3-mballoc3-core.patch	30 Aug 2007 03:57:03 -0000	1.1.4.2
++++ ./ldiskfs/kernel_patches/patches/ext3-mballoc3-core.patch	14 Sep 2007 07:56:13 -0000
+@@ -183,7 +183,7 @@ Index: linux-2.6.9-full/fs/ext3/mballoc.
+ ===================================================================
+ --- linux-2.6.9-full.orig/fs/ext3/mballoc.c	2007-07-14 04:24:39.138985848 +0400
+ +++ linux-2.6.9-full/fs/ext3/mballoc.c	2007-07-20 11:31:03.000000000 +0400
+-@@ -0,0 +1,4391 @@
++@@ -0,0 +1,4393 @@
+ +/*
+ + * Copyright (c) 2003-2006, Cluster File Systems, Inc, info at clusterfs.com
+ + * Written by Alex Tomas <alex at clusterfs.com>
+@@ -3515,7 +3515,9 @@ Index: linux-2.6.9-full/fs/ext3/mballoc.
+ +		ext3_get_group_no_and_offset(sb, pa->pa_pstart, &groupnr, &start);
+ +		len = pa->pa_len;
+ +		spin_unlock(&pa->pa_lock);
+-+		BUG_ON(groupnr != group);
+++		if (unlikely(len == 0))
+++			continue;
+++		BUG_ON(groupnr != group && len != 0);
+ +		mb_set_bits(bitmap, start, len);
+ +		preallocated += len;
+ +		count++;
+@@ -3762,7 +3764,7 @@ Index: linux-2.6.9-full/fs/ext3/mballoc.
+ +
+ +	BUG_ON(pa->pa_deleted == 0);
+ +	ext3_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
+-+	BUG_ON(group != e3b->bd_group);
+++	BUG_ON(group != e3b->bd_group && pa->pa_len != 0);
+ +	end = bit + pa->pa_len;
+ +
+ +	ac.ac_sb = sb;
+@@ -3816,7 +3818,7 @@ Index: linux-2.6.9-full/fs/ext3/mballoc.
+ +
+ +	BUG_ON(pa->pa_deleted == 0);
+ +	ext3_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
+-+	BUG_ON(group != e3b->bd_group);
+++	BUG_ON(group != e3b->bd_group && pa->pa_len != 0);
+ +	mb_free_blocks(pa->pa_inode, e3b, bit, pa->pa_len);
+ +	atomic_add(pa->pa_len, &EXT3_SB(sb)->s_mb_discarded);
+ +