From: alex <alex>
Date: Sun, 7 Aug 2005 11:18:14 +0000 (+0000)
Subject: b=7264
X-Git-Tag: v1_7_100~973
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=61e364d8e43bca2b0f0d6bc7ea354e8fee69b91b

b=7264

 - mballoc must not be used during orphan cleanup
---

diff --git a/lustre/kernel_patches/patches/ext3-mballoc2-2.6.10-fc3.patch b/lustre/kernel_patches/patches/ext3-mballoc2-2.6.10-fc3.patch
index 2a4bc1f..6d6dc0a 100644
--- a/lustre/kernel_patches/patches/ext3-mballoc2-2.6.10-fc3.patch
+++ b/lustre/kernel_patches/patches/ext3-mballoc2-2.6.10-fc3.patch
@@ -1856,7 +1856,7 @@ Index: linux-2.6.10/fs/ext3/mballoc.c
 +	int freed;
 +
 +	sb = inode->i_sb;
-+	if (!test_opt(sb, MBALLOC))
++	if (!test_opt(sb, MBALLOC) || EXT3_SB(sb)->s_buddy_blocks == NULL)
 +		ext3_free_blocks_sb(handle, sb, block, count, &freed);
 +	else
 +		ext3_mb_free_blocks(handle, inode, block, count, metadata, &freed);