diff --git a/[refs] b/[refs] index d1388e5e21fd..01eab69f7e9a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 68576cf122bc5195c758ed295e78b5858472378a +refs/heads/master: 6454d1f9038f708d7deef6270ed4ba5bb6e55869 diff --git a/trunk/fs/ext2/ext2.h b/trunk/fs/ext2/ext2.h index 7730388c4931..c87ae29c19cb 100644 --- a/trunk/fs/ext2/ext2.h +++ b/trunk/fs/ext2/ext2.h @@ -178,3 +178,10 @@ extern const struct inode_operations ext2_special_inode_operations; /* symlink.c */ extern const struct inode_operations ext2_fast_symlink_inode_operations; extern const struct inode_operations ext2_symlink_inode_operations; + +static inline ext2_fsblk_t +ext2_group_first_block_no(struct super_block *sb, unsigned long group_no) +{ + return group_no * (ext2_fsblk_t)EXT2_BLOCKS_PER_GROUP(sb) + + le32_to_cpu(EXT2_SB(sb)->s_es->s_first_data_block); +} diff --git a/trunk/include/linux/ext2_fs.h b/trunk/include/linux/ext2_fs.h index 0f6c86c634fd..84cec2aa9f1e 100644 --- a/trunk/include/linux/ext2_fs.h +++ b/trunk/include/linux/ext2_fs.h @@ -563,11 +563,4 @@ enum { ~EXT2_DIR_ROUND) #define EXT2_MAX_REC_LEN ((1<<16)-1) -static inline ext2_fsblk_t -ext2_group_first_block_no(struct super_block *sb, unsigned long group_no) -{ - return group_no * (ext2_fsblk_t)EXT2_BLOCKS_PER_GROUP(sb) + - le32_to_cpu(EXT2_SB(sb)->s_es->s_first_data_block); -} - #endif /* _LINUX_EXT2_FS_H */