From: tianzy Date: Mon, 15 Dec 2008 14:53:37 +0000 (+0000) Subject: Branch HEAD X-Git-Tag: v1_9_130~32 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=4eb3e4177bc960015de0b9c7974980dcee7033d1 Branch HEAD 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 97758a6..16b250e 100644 --- a/lustre/lvfs/fsfilt_ext3.c +++ b/lustre/lvfs/fsfilt_ext3.c @@ -2098,9 +2098,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> * * 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; }