From: adilger <adilger>
Date: Tue, 1 Mar 2005 09:52:12 +0000 (+0000)
Subject: Branch: b1_4
X-Git-Tag: v1_8_0_110~486^7~161
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=f22179a3d8d4fe06c250e057191dc379447edf31;p=fs%2Flustre-release.git

Branch: b1_4
Disable extents/mballoc with old patch, but allow Lustre to build.
---

diff --git a/lustre/lvfs/fsfilt_ext3.c b/lustre/lvfs/fsfilt_ext3.c
index 6ac3090..ab42f917 100644
--- a/lustre/lvfs/fsfilt_ext3.c
+++ b/lustre/lvfs/fsfilt_ext3.c
@@ -635,6 +635,11 @@ static int fsfilt_ext3_sync(struct super_block *sb)
         return ext3_force_commit(sb);
 }
 
+#ifndef EXT3_EXT_CACHE_NO       /* we need this for struct ext3_ext_cache */
+#undef EXT3_MULTIBLOCK_ALLOCATOR
+#warning "kernel code has old extents/mballoc patch, disabling"
+#endif
+
 #ifdef EXT3_MULTIBLOCK_ALLOCATOR
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
 #define ext3_up_truncate_sem(inode)  up_write(&EXT3_I(inode)->truncate_sem);