From d85c5fd8c5fde44f7a6e7bb5330f8d23fc4e3127 Mon Sep 17 00:00:00 2001
From: Tobias Poschwatta <tp@fonz.de>
Date: Wed, 28 Nov 2007 16:21:45 -0800
Subject: [PATCH] --- yaml --- r: 74367 b: refs/heads/master c:
 6454d1f9038f708d7deef6270ed4ba5bb6e55869 h: refs/heads/master i:   74365:
 c1f6e0fc10106cda78edd2798ccb74862a154a37   74363:
 6dc18fee972234ca7964f5ca7ec0ac76f8b8f5e9   74359:
 4d9291990d13cce9acd84aa136ff5cf834b97b5f   74351:
 438dcd5aa3c7842b671895317780f3e373843f86   74335:
 1c695d89d1522da654ba470e7852e73c851be924   74303:
 75dda3d592fe7be9e390b17bc3eb102957a9db8e   74239:
 137e827968f93f649032c7545fd654fddbb7ccba v: v3

---
 [refs]                        | 2 +-
 trunk/fs/ext2/ext2.h          | 7 +++++++
 trunk/include/linux/ext2_fs.h | 7 -------
 3 files changed, 8 insertions(+), 8 deletions(-)

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 */