[Ocfs2-commits] manish commits r1646 - trunk/src

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-11-15 16:14:36 -0600 (Mon, 15 Nov 2004)
New Revision: 1646

Modified:
   trunk/src/suballoc.c
Log:
Move inline function bodies so they are defined before they are used


Modified: trunk/src/suballoc.c
===================================================================
--- trunk/src/suballoc.c	2004-11-13 00:18:04 UTC (rev 1645)
+++ trunk/src/suballoc.c	2004-11-15 22:14:36 UTC (rev 1646)
@@ -1252,6 +1252,62 @@
 	return status;
 }
 
+/* translate a group desc. blkno and it's bitmap offset into
+ * disk cluster offset. */
+static inline u32 ocfs2_desc_bitmap_to_cluster_off(struct inode *inode,
+						   u64 bg_blkno,
+						   u16 bg_bit_off)
+{
+	ocfs_super *osb = OCFS2_SB(inode->i_sb);
+	u32 cluster = 0;
+
+	OCFS_ASSERT(ocfs2_is_cluster_bitmap(inode));
+
+	if (bg_blkno != osb->first_cluster_group_blkno)
+		cluster = ocfs2_blocks_to_clusters(inode->i_sb, bg_blkno);
+	cluster += (u32) bg_bit_off;
+	return cluster;
+}
+
+/* given a cluster offset, calculate which block group it belongs to
+ * and return that block offset. */
+static inline u64 ocfs2_which_cluster_group(struct inode *inode,
+					    u32 cluster)
+{
+	ocfs_super *osb = OCFS2_SB(inode->i_sb);
+	u32 group_no;
+
+	OCFS_ASSERT(ocfs2_is_cluster_bitmap(inode));
+
+	group_no = cluster / osb->bitmap_cpg;
+	if (!group_no)
+		return osb->first_cluster_group_blkno;
+	return ocfs2_clusters_to_blocks(inode->i_sb,
+					group_no * osb->bitmap_cpg);
+}
+
+/* given the block number of a cluster start, calculate which cluster
+ * group and descriptor bitmap offset that corresponds to. */
+static inline void ocfs2_block_to_cluster_group(struct inode *inode,
+						u64 data_blkno,
+						u64 *bg_blkno,
+						u16 *bg_bit_off)
+{
+	ocfs_super *osb = OCFS2_SB(inode->i_sb);
+	u32 data_cluster = ocfs2_blocks_to_clusters(osb->sb, data_blkno);
+
+	OCFS_ASSERT(ocfs2_is_cluster_bitmap(inode));
+
+	*bg_blkno = ocfs2_which_cluster_group(inode,
+					      data_cluster);
+
+	if (*bg_blkno == osb->first_cluster_group_blkno)
+		*bg_bit_off = (u16) data_cluster;
+	else
+		*bg_bit_off = (u16) ocfs2_blocks_to_clusters(osb->sb,
+							     data_blkno - *bg_blkno);
+}
+
 /*
  * min_bits - minimum contiguous chunk from this total allocation we
  * can handle. set to what we asked for originally for a full
@@ -1480,62 +1536,6 @@
 				       bit, bg_blkno, 1);
 }
 
-/* translate a group desc. blkno and it's bitmap offset into
- * disk cluster offset. */
-static inline u32 ocfs2_desc_bitmap_to_cluster_off(struct inode *inode,
-						   u64 bg_blkno,
-						   u16 bg_bit_off)
-{
-	ocfs_super *osb = OCFS2_SB(inode->i_sb);
-	u32 cluster = 0;
-
-	OCFS_ASSERT(ocfs2_is_cluster_bitmap(inode));
-
-	if (bg_blkno != osb->first_cluster_group_blkno)
-		cluster = ocfs2_blocks_to_clusters(inode->i_sb, bg_blkno);
-	cluster += (u32) bg_bit_off;
-	return cluster;
-}
-
-/* given a cluster offset, calculate which block group it belongs to
- * and return that block offset. */
-static inline u64 ocfs2_which_cluster_group(struct inode *inode,
-					    u32 cluster)
-{
-	ocfs_super *osb = OCFS2_SB(inode->i_sb);
-	u32 group_no;
-
-	OCFS_ASSERT(ocfs2_is_cluster_bitmap(inode));
-
-	group_no = cluster / osb->bitmap_cpg;
-	if (!group_no)
-		return osb->first_cluster_group_blkno;
-	return ocfs2_clusters_to_blocks(inode->i_sb,
-					group_no * osb->bitmap_cpg);
-}
-
-/* given the block number of a cluster start, calculate which cluster
- * group and descriptor bitmap offset that corresponds to. */
-static inline void ocfs2_block_to_cluster_group(struct inode *inode,
-						u64 data_blkno,
-						u64 *bg_blkno,
-						u16 *bg_bit_off)
-{
-	ocfs_super *osb = OCFS2_SB(inode->i_sb);
-	u32 data_cluster = ocfs2_blocks_to_clusters(osb->sb, data_blkno);
-
-	OCFS_ASSERT(ocfs2_is_cluster_bitmap(inode));
-
-	*bg_blkno = ocfs2_which_cluster_group(inode,
-					      data_cluster);
-
-	if (*bg_blkno == osb->first_cluster_group_blkno)
-		*bg_bit_off = (u16) data_cluster;
-	else
-		*bg_bit_off = (u16) ocfs2_blocks_to_clusters(osb->sb,
-							     data_blkno - *bg_blkno);
-}
-
 int ocfs_free_clusters(ocfs_journal_handle *handle,
 		       struct inode *bitmap_inode,
 		       struct buffer_head *bitmap_bh,