From: tianzy <tianzy>
Date: Mon, 15 Dec 2008 14:53:33 +0000 (+0000)
Subject: Branch b_release_1_8_0
X-Git-Tag: v1_7_160~69
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=89987aeb3d87f24a42b40b93084e1f7a496c359c;p=fs%2Flustre-release.git

Branch b_release_1_8_0
fix a build error caused by the patch of 16542
b=18027
i=tianzy
i=girish.shilamkar
---

diff --git a/lustre/lvfs/fsfilt_ext3.c b/lustre/lvfs/fsfilt_ext3.c
index 52a7f9c..43b3f0c 100644
--- a/lustre/lvfs/fsfilt_ext3.c
+++ b/lustre/lvfs/fsfilt_ext3.c
@@ -2136,9 +2136,17 @@ static int fsfilt_ext3_dquot(struct lustre_dquot *dquot, int cmd)
 static int fsfilt_ext3_get_mblk(struct super_block *sb, int *count,
                                 struct inode *inode, int frags)
 {
+#ifdef EXT3_EXT_HAS_NO_TREE
+        struct ext3_ext_base *base = inode;
+#else
+        struct ext3_extents_tree tree;
+        struct ext3_ext_base *base = &tree;
+
+        ext3_init_tree_desc(base, inode);
+#endif
         /* for an ost_write request, it needs <#fragments> * <tree depth + 1>
          * metablocks at maxium b=16542 */
-        *count = frags * (EXT_DEPTH(inode) + 1) * EXT3_BLOCK_SIZE(sb);
+        *count = frags * (EXT_DEPTH(base) + 1) * EXT3_BLOCK_SIZE(sb);
         return 0;
 }