From a7197ad3481e7af80ddbba864b6800c24e3484b0 Mon Sep 17 00:00:00 2001 From: johann Date: Thu, 4 Jun 2009 21:42:27 +0000 Subject: [PATCH] Branch b1_8 b=19725 i=adilger i=girish use ext4_read_inode_bitmap() in fsfilt code. --- lustre/lvfs/fsfilt_ext3.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lustre/lvfs/fsfilt_ext3.c b/lustre/lvfs/fsfilt_ext3.c index f6a9092..0339733 100644 --- a/lustre/lvfs/fsfilt_ext3.c +++ b/lustre/lvfs/fsfilt_ext3.c @@ -1705,8 +1705,9 @@ get_group_desc(struct super_block *sb, int group) return gdp + desc; } +#ifndef HAVE_EXT4_LDISKFS static inline struct buffer_head * -read_inode_bitmap(struct super_block *sb, unsigned long group) +ext3_read_inode_bitmap(struct super_block *sb, unsigned long group) { struct ext3_group_desc *desc; struct buffer_head *bh; @@ -1715,6 +1716,7 @@ read_inode_bitmap(struct super_block *sb, unsigned long group) bh = sb_bread(sb, ext3_inode_bitmap(sb, desc)); return bh; } +#endif static inline struct inode *ext3_iget_inuse(struct super_block *sb, struct buffer_head *bitmap_bh, @@ -2018,9 +2020,9 @@ static int fsfilt_ext3_quotacheck(struct super_block *sb, /* check quota and update in hash */ for (group = 0; group < sbi->s_groups_count; group++) { ino = group * sbi->s_inodes_per_group + 1; - bitmap_bh = read_inode_bitmap(sb, group); + bitmap_bh = ext3_read_inode_bitmap(sb, group); if (!bitmap_bh) { - CERROR("read_inode_bitmap group %d failed", group); + CERROR("ext3_read_inode_bitmap group %d failed", group); GOTO(out, -EIO); } -- 1.8.3.1