[Ocfs2-commits] jlbec commits r2683 - branches/enotypedefs/fs/ocfs2

svn-commits at oss.oracle.com svn-commits at oss.oracle.com
Tue Nov 8 16:07:43 CST 2005


Author: jlbec
Date: 2005-11-08 16:07:41 -0600 (Tue, 08 Nov 2005)
New Revision: 2683

Modified:
   branches/enotypedefs/fs/ocfs2/alloc.c
   branches/enotypedefs/fs/ocfs2/alloc.h
   branches/enotypedefs/fs/ocfs2/dir.c
   branches/enotypedefs/fs/ocfs2/dir.h
   branches/enotypedefs/fs/ocfs2/file.c
   branches/enotypedefs/fs/ocfs2/file.h
   branches/enotypedefs/fs/ocfs2/localalloc.c
   branches/enotypedefs/fs/ocfs2/localalloc.h
   branches/enotypedefs/fs/ocfs2/namei.c
   branches/enotypedefs/fs/ocfs2/suballoc.c
   branches/enotypedefs/fs/ocfs2/suballoc.h
Log:

o Remove ocfs2_alloc_context typedef



Modified: branches/enotypedefs/fs/ocfs2/alloc.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/alloc.c	2005-11-08 21:42:56 UTC (rev 2682)
+++ branches/enotypedefs/fs/ocfs2/alloc.c	2005-11-08 22:07:41 UTC (rev 2683)
@@ -55,7 +55,7 @@
 				     struct ocfs2_journal_handle *handle,
 				     struct inode *inode,
 				     int wanted,
-				     ocfs2_alloc_context *meta_ac,
+				     struct ocfs2_alloc_context *meta_ac,
 				     struct buffer_head *bhs[]);
 
 static int ocfs2_add_branch(ocfs2_super *osb,
@@ -64,13 +64,13 @@
 			    struct buffer_head *fe_bh,
 			    struct buffer_head *eb_bh,
 			    struct buffer_head *last_eb_bh,
-			    ocfs2_alloc_context *meta_ac);
+			    struct ocfs2_alloc_context *meta_ac);
 
 static int ocfs2_shift_tree_depth(ocfs2_super *osb,
 				  struct ocfs2_journal_handle *handle,
 				  struct inode *inode,
 				  struct buffer_head *fe_bh,
-				  ocfs2_alloc_context *meta_ac,
+				  struct ocfs2_alloc_context *meta_ac,
 				  struct buffer_head **ret_new_eb_bh);
 
 static int ocfs2_do_insert_extent(ocfs2_super *osb,
@@ -155,7 +155,7 @@
 				     struct ocfs2_journal_handle *handle,
 				     struct inode *inode,
 				     int wanted,
-				     ocfs2_alloc_context *meta_ac,
+				     struct ocfs2_alloc_context *meta_ac,
 				     struct buffer_head *bhs[])
 {
 	int count, status, i;
@@ -258,7 +258,7 @@
 			    struct buffer_head *fe_bh,
 			    struct buffer_head *eb_bh,
 			    struct buffer_head *last_eb_bh,
-			    ocfs2_alloc_context *meta_ac)
+			    struct ocfs2_alloc_context *meta_ac)
 {
 	int status, new_blocks, i;
 	u64 next_blkno, new_last_eb_blk;
@@ -421,7 +421,7 @@
 				  struct ocfs2_journal_handle *handle,
 				  struct inode *inode,
 				  struct buffer_head *fe_bh,
-				  ocfs2_alloc_context *meta_ac,
+				  struct ocfs2_alloc_context *meta_ac,
 				  struct buffer_head **ret_new_eb_bh)
 {
 	int status, i;
@@ -815,7 +815,7 @@
 			struct buffer_head *fe_bh,
 			u64 start_blk,
 			u32 new_clusters,
-			ocfs2_alloc_context *meta_ac)
+			struct ocfs2_alloc_context *meta_ac)
 {
 	int status, i, shift;
 	struct buffer_head *last_eb_bh = NULL;

Modified: branches/enotypedefs/fs/ocfs2/alloc.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/alloc.h	2005-11-08 21:42:56 UTC (rev 2682)
+++ branches/enotypedefs/fs/ocfs2/alloc.h	2005-11-08 22:07:41 UTC (rev 2683)
@@ -26,14 +26,14 @@
 #ifndef OCFS2_ALLOC_H
 #define OCFS2_ALLOC_H
 
-struct _ocfs2_alloc_context;
+struct ocfs2_alloc_context;
 int ocfs2_insert_extent(ocfs2_super *osb,
 			struct ocfs2_journal_handle *handle,
 			struct inode *inode,
 			struct buffer_head *fe_bh,
 			u64 blkno,
 			u32 new_clusters,
-			struct _ocfs2_alloc_context *meta_ac);
+			struct ocfs2_alloc_context *meta_ac);
 int ocfs2_num_free_extents(ocfs2_super *osb,
 			   struct inode *inode,
 			   struct ocfs2_dinode *fe);

Modified: branches/enotypedefs/fs/ocfs2/dir.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/dir.c	2005-11-08 21:42:56 UTC (rev 2682)
+++ branches/enotypedefs/fs/ocfs2/dir.c	2005-11-08 22:07:41 UTC (rev 2683)
@@ -343,8 +343,8 @@
 			struct ocfs2_journal_handle *handle,
 			struct inode *dir,
 			struct buffer_head *parent_fe_bh,
-			ocfs2_alloc_context *data_ac,
-			ocfs2_alloc_context *meta_ac,
+			struct ocfs2_alloc_context *data_ac,
+			struct ocfs2_alloc_context *meta_ac,
 			struct buffer_head **new_bh)
 {
 	int status;
@@ -396,8 +396,8 @@
 	int credits, num_free_extents;
 	loff_t dir_i_size;
 	struct ocfs2_dinode *fe = (struct ocfs2_dinode *) parent_fe_bh->b_data;
-	ocfs2_alloc_context *data_ac = NULL;
-	ocfs2_alloc_context *meta_ac = NULL;
+	struct ocfs2_alloc_context *data_ac = NULL;
+	struct ocfs2_alloc_context *meta_ac = NULL;
 	struct ocfs2_journal_handle *handle = NULL;
 	struct buffer_head *new_bh = NULL;
 	struct ocfs2_dir_entry * de;

Modified: branches/enotypedefs/fs/ocfs2/dir.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/dir.h	2005-11-08 21:42:56 UTC (rev 2682)
+++ branches/enotypedefs/fs/ocfs2/dir.h	2005-11-08 22:07:41 UTC (rev 2683)
@@ -43,12 +43,12 @@
 				 const char *name,
 				 int namelen,
 				 struct buffer_head **ret_de_bh);
-struct _ocfs2_alloc_context;
+struct ocfs2_alloc_context;
 int ocfs2_do_extend_dir(struct super_block *sb,
 			struct ocfs2_journal_handle *handle,
 			struct inode *dir,
 			struct buffer_head *parent_fe_bh,
-			struct _ocfs2_alloc_context *data_ac,
-			struct _ocfs2_alloc_context *meta_ac,
+			struct ocfs2_alloc_context *data_ac,
+			struct ocfs2_alloc_context *meta_ac,
 			struct buffer_head **new_bh);
 #endif /* OCFS2_DIR_H */

Modified: branches/enotypedefs/fs/ocfs2/file.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/file.c	2005-11-08 21:42:56 UTC (rev 2682)
+++ branches/enotypedefs/fs/ocfs2/file.c	2005-11-08 22:07:41 UTC (rev 2683)
@@ -331,8 +331,8 @@
 			       u32 clusters_to_add,
 			       struct buffer_head *fe_bh,
 			       struct ocfs2_journal_handle *handle,
-			       ocfs2_alloc_context *data_ac,
-			       ocfs2_alloc_context *meta_ac,
+			       struct ocfs2_alloc_context *data_ac,
+			       struct ocfs2_alloc_context *meta_ac,
 			       enum ocfs2_alloc_restarted *reason_ret)
 {
 	int status = 0;
@@ -436,8 +436,8 @@
 	struct buffer_head *bh = NULL;
 	struct ocfs2_dinode *fe = NULL;
 	struct ocfs2_journal_handle *handle = NULL;
-	ocfs2_alloc_context *data_ac = NULL;
-	ocfs2_alloc_context *meta_ac = NULL;
+	struct ocfs2_alloc_context *data_ac = NULL;
+	struct ocfs2_alloc_context *meta_ac = NULL;
 	enum ocfs2_alloc_restarted why;
 	ocfs2_super *osb = OCFS2_SB(inode->i_sb);
 

Modified: branches/enotypedefs/fs/ocfs2/file.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/file.h	2005-11-08 21:42:56 UTC (rev 2682)
+++ branches/enotypedefs/fs/ocfs2/file.h	2005-11-08 22:07:41 UTC (rev 2683)
@@ -30,7 +30,7 @@
 extern struct file_operations ocfs2_dops;
 extern struct inode_operations ocfs2_file_iops;
 extern struct inode_operations ocfs2_special_file_iops;
-struct _ocfs2_alloc_context;
+struct ocfs2_alloc_context;
 
 enum ocfs2_alloc_restarted {
 	RESTART_NONE = 0,
@@ -42,8 +42,8 @@
 			       u32 clusters_to_add,
 			       struct buffer_head *fe_bh,
 			       struct ocfs2_journal_handle *handle,
-			       struct _ocfs2_alloc_context *data_ac,
-			       struct _ocfs2_alloc_context *meta_ac,
+			       struct ocfs2_alloc_context *data_ac,
+			       struct ocfs2_alloc_context *meta_ac,
 			       enum ocfs2_alloc_restarted *reason);
 int ocfs2_setattr(struct dentry *dentry, struct iattr *attr);
 int ocfs2_getattr(struct vfsmount *mnt, struct dentry *dentry,

Modified: branches/enotypedefs/fs/ocfs2/localalloc.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/localalloc.c	2005-11-08 21:42:56 UTC (rev 2682)
+++ branches/enotypedefs/fs/ocfs2/localalloc.c	2005-11-08 22:07:41 UTC (rev 2683)
@@ -65,13 +65,13 @@
 
 static int ocfs2_local_alloc_reserve_for_window(ocfs2_super *osb,
 						struct ocfs2_journal_handle *handle,
-						ocfs2_alloc_context **ac,
+						struct ocfs2_alloc_context **ac,
 						struct inode **bitmap_inode,
 						struct buffer_head **bitmap_bh);
 
 static int ocfs2_local_alloc_new_window(ocfs2_super *osb,
 					struct ocfs2_journal_handle *handle,
-					ocfs2_alloc_context *ac);
+					struct ocfs2_alloc_context *ac);
 
 static int ocfs2_local_alloc_slide_window(ocfs2_super *osb,
 					  struct inode *local_alloc_inode);
@@ -454,7 +454,7 @@
 int ocfs2_reserve_local_alloc_bits(ocfs2_super *osb,
 				   struct ocfs2_journal_handle *passed_handle,
 				   u32 bits_wanted,
-				   ocfs2_alloc_context *ac)
+				   struct ocfs2_alloc_context *ac)
 {
 	int status;
 	struct ocfs2_dinode *alloc;
@@ -530,7 +530,7 @@
 
 int ocfs2_claim_local_alloc_bits(ocfs2_super *osb,
 				 struct ocfs2_journal_handle *handle,
-				 ocfs2_alloc_context *ac,
+				 struct ocfs2_alloc_context *ac,
 				 u32 min_bits,
 				 u32 *bit_off,
 				 u32 *num_bits)
@@ -778,13 +778,13 @@
 
 static int ocfs2_local_alloc_reserve_for_window(ocfs2_super *osb,
 						struct ocfs2_journal_handle *handle,
-						ocfs2_alloc_context **ac,
+						struct ocfs2_alloc_context **ac,
 						struct inode **bitmap_inode,
 						struct buffer_head **bitmap_bh)
 {
 	int status;
 
-	*ac = kcalloc(1, sizeof(ocfs2_alloc_context), GFP_KERNEL);
+	*ac = kcalloc(1, sizeof(struct ocfs2_alloc_context), GFP_KERNEL);
 	if (!(*ac)) {
 		status = -ENOMEM;
 		mlog_errno(status);
@@ -821,7 +821,7 @@
  */
 static int ocfs2_local_alloc_new_window(ocfs2_super *osb,
 					struct ocfs2_journal_handle *handle,
-					ocfs2_alloc_context *ac)
+					struct ocfs2_alloc_context *ac)
 {
 	int status = 0;
 	u32 cluster_off, cluster_count;
@@ -882,7 +882,7 @@
 	struct ocfs2_journal_handle *handle = NULL;
 	struct ocfs2_dinode *alloc;
 	struct ocfs2_dinode *alloc_copy = NULL;
-	ocfs2_alloc_context *ac = NULL;
+	struct ocfs2_alloc_context *ac = NULL;
 
 	mlog_entry_void();
 

Modified: branches/enotypedefs/fs/ocfs2/localalloc.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/localalloc.h	2005-11-08 21:42:56 UTC (rev 2682)
+++ branches/enotypedefs/fs/ocfs2/localalloc.h	2005-11-08 22:07:41 UTC (rev 2683)
@@ -40,15 +40,15 @@
 int ocfs2_alloc_should_use_local(ocfs2_super *osb,
 				 u64 bits);
 
-struct _ocfs2_alloc_context;
+struct ocfs2_alloc_context;
 int ocfs2_reserve_local_alloc_bits(ocfs2_super *osb,
 				   struct ocfs2_journal_handle *passed_handle,
 				   u32 bits_wanted,
-				   struct _ocfs2_alloc_context *ac);
+				   struct ocfs2_alloc_context *ac);
 
 int ocfs2_claim_local_alloc_bits(ocfs2_super *osb,
 				 struct ocfs2_journal_handle *handle,
-				 struct _ocfs2_alloc_context *ac,
+				 struct ocfs2_alloc_context *ac,
 				 u32 min_bits,
 				 u32 *bit_off,
 				 u32 *num_bits);

Modified: branches/enotypedefs/fs/ocfs2/namei.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/namei.c	2005-11-08 21:42:56 UTC (rev 2682)
+++ branches/enotypedefs/fs/ocfs2/namei.c	2005-11-08 22:07:41 UTC (rev 2683)
@@ -93,14 +93,14 @@
 			      struct buffer_head *parent_fe_bh,
 			      struct ocfs2_journal_handle *handle,
 			      struct inode **ret_inode,
-			      ocfs2_alloc_context *inode_ac);
+			      struct ocfs2_alloc_context *inode_ac);
 
 static int ocfs2_fill_new_dir(ocfs2_super *osb,
 			      struct ocfs2_journal_handle *handle,
 			      struct inode *parent,
 			      struct inode *inode,
 			      struct buffer_head *fe_bh,
-			      ocfs2_alloc_context *data_ac);
+			      struct ocfs2_alloc_context *data_ac);
 
 static int ocfs2_double_lock(ocfs2_super *osb,
 			     struct ocfs2_journal_handle *handle,
@@ -221,7 +221,7 @@
 			      struct inode *parent,
 			      struct inode *inode,
 			      struct buffer_head *fe_bh,
-			      ocfs2_alloc_context *data_ac)
+			      struct ocfs2_alloc_context *data_ac)
 {
 	int status;
 	struct buffer_head *new_bh = NULL;
@@ -298,8 +298,8 @@
 	struct buffer_head *new_fe_bh = NULL;
 	struct buffer_head *de_bh = NULL;
 	struct inode *inode = NULL;
-	ocfs2_alloc_context *inode_ac = NULL;
-	ocfs2_alloc_context *data_ac = NULL;
+	struct ocfs2_alloc_context *inode_ac = NULL;
+	struct ocfs2_alloc_context *data_ac = NULL;
 
 	mlog_entry("(0x%p, 0x%p, %d, %lu, '%.*s')\n", dir, dentry, mode,
 		   (unsigned long)dev, dentry->d_name.len,
@@ -458,7 +458,7 @@
 			      struct buffer_head *parent_fe_bh,
 			      struct ocfs2_journal_handle *handle,
 			      struct inode **ret_inode,
-			      ocfs2_alloc_context *inode_ac)
+			      struct ocfs2_alloc_context *inode_ac)
 {
 	int status = 0;
 	struct ocfs2_dinode *fe = NULL;
@@ -1540,8 +1540,8 @@
 	struct ocfs2_dinode *fe = NULL;
 	struct ocfs2_dinode *dirfe;
 	struct ocfs2_journal_handle *handle = NULL;
-	ocfs2_alloc_context *inode_ac = NULL;
-	ocfs2_alloc_context *data_ac = NULL;
+	struct ocfs2_alloc_context *inode_ac = NULL;
+	struct ocfs2_alloc_context *data_ac = NULL;
 
 	mlog_entry("(0x%p, 0x%p, symname='%s' actual='%.*s')\n", dir,
 		   dentry, symname, dentry->d_name.len, dentry->d_name.name);

Modified: branches/enotypedefs/fs/ocfs2/suballoc.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/suballoc.c	2005-11-08 21:42:56 UTC (rev 2682)
+++ branches/enotypedefs/fs/ocfs2/suballoc.c	2005-11-08 22:07:41 UTC (rev 2683)
@@ -60,7 +60,7 @@
 				   struct buffer_head *bh);
 
 static int ocfs2_reserve_suballoc_bits(ocfs2_super *osb,
-				       ocfs2_alloc_context *ac);
+				       struct ocfs2_alloc_context *ac);
 
 static int ocfs2_cluster_group_search(struct inode *inode,
 				      struct buffer_head *group_bh,
@@ -70,14 +70,14 @@
 				    struct buffer_head *group_bh,
 				    u32 bits_wanted, u32 min_bits,
 				    u16 *bit_off, u16 *bits_found);
-static int ocfs2_search_chain(ocfs2_alloc_context *ac,
+static int ocfs2_search_chain(struct ocfs2_alloc_context *ac,
 			      u32 bits_wanted,
 			      u32 min_bits,
 			      u16 *bit_off,
 			      unsigned int *num_bits,
 			      u64 *bg_blkno);
 static int ocfs2_claim_suballoc_bits(ocfs2_super *osb,
-				     ocfs2_alloc_context *ac,
+				     struct ocfs2_alloc_context *ac,
 				     u32 bits_wanted,
 				     u32 min_bits,
 				     u16 *bit_off,
@@ -129,7 +129,7 @@
 						u64 *bg_blkno,
 						u16 *bg_bit_off);
 
-void ocfs2_free_alloc_context(ocfs2_alloc_context *ac)
+void ocfs2_free_alloc_context(struct ocfs2_alloc_context *ac)
 {
 	if (ac->ac_inode)
 		iput(ac->ac_inode);
@@ -224,7 +224,7 @@
 	int status, credits;
 	struct ocfs2_dinode *fe = (struct ocfs2_dinode *) bh->b_data;
 	struct ocfs2_chain_list *cl;
-	ocfs2_alloc_context *ac = NULL;
+	struct ocfs2_alloc_context *ac = NULL;
 	struct ocfs2_journal_handle *handle = NULL;
 	u32 bit_off, num_bits;
 	u16 alloc_rec;
@@ -354,7 +354,7 @@
 }
 
 static int ocfs2_reserve_suballoc_bits(ocfs2_super *osb,
-				       ocfs2_alloc_context *ac)
+				       struct ocfs2_alloc_context *ac)
 {
 	int status;
 	u32 bits_wanted = ac->ac_bits_wanted;
@@ -427,12 +427,12 @@
 int ocfs2_reserve_new_metadata(ocfs2_super *osb,
 			       struct ocfs2_journal_handle *handle,
 			       struct ocfs2_dinode *fe,
-			       ocfs2_alloc_context **ac)
+			       struct ocfs2_alloc_context **ac)
 {
 	int status;
 	struct inode *alloc_inode = NULL;
 
-	*ac = kcalloc(1, sizeof(ocfs2_alloc_context), GFP_KERNEL);
+	*ac = kcalloc(1, sizeof(struct ocfs2_alloc_context), GFP_KERNEL);
 	if (!(*ac)) {
 		status = -ENOMEM;
 		mlog_errno(status);
@@ -484,12 +484,12 @@
 
 int ocfs2_reserve_new_inode(ocfs2_super *osb,
 			    struct ocfs2_journal_handle *handle,
-			    ocfs2_alloc_context **ac)
+			    struct ocfs2_alloc_context **ac)
 {
 	int status;
 	struct inode *alloc_inode = NULL;
 
-	*ac = kcalloc(1, sizeof(ocfs2_alloc_context), GFP_KERNEL);
+	*ac = kcalloc(1, sizeof(struct ocfs2_alloc_context), GFP_KERNEL);
 	if (!(*ac)) {
 		status = -ENOMEM;
 		mlog_errno(status);
@@ -536,7 +536,7 @@
 /* local alloc code has to do the same thing, so rather than do this
  * twice.. */
 int ocfs2_reserve_cluster_bitmap_bits(ocfs2_super *osb,
-				      ocfs2_alloc_context *ac)
+				      struct ocfs2_alloc_context *ac)
 {
 	int status;
 
@@ -564,7 +564,7 @@
 int ocfs2_reserve_clusters(ocfs2_super *osb,
 			   struct ocfs2_journal_handle *handle,
 			   u32 bits_wanted,
-			   ocfs2_alloc_context **ac)
+			   struct ocfs2_alloc_context **ac)
 {
 	int status;
 
@@ -572,7 +572,7 @@
 
 	BUG_ON(!handle);
 
-	*ac = kcalloc(1, sizeof(ocfs2_alloc_context), GFP_KERNEL);
+	*ac = kcalloc(1, sizeof(struct ocfs2_alloc_context), GFP_KERNEL);
 	if (!(*ac)) {
 		status = -ENOMEM;
 		mlog_errno(status);
@@ -954,7 +954,7 @@
 	return ret;
 }
 
-static int ocfs2_search_chain(ocfs2_alloc_context *ac,
+static int ocfs2_search_chain(struct ocfs2_alloc_context *ac,
 			      u32 bits_wanted,
 			      u32 min_bits,
 			      u16 *bit_off,
@@ -1108,7 +1108,7 @@
 
 /* will give out up to bits_wanted contiguous bits. */
 static int ocfs2_claim_suballoc_bits(ocfs2_super *osb,
-				     ocfs2_alloc_context *ac,
+				     struct ocfs2_alloc_context *ac,
 				     u32 bits_wanted,
 				     u32 min_bits,
 				     u16 *bit_off,
@@ -1191,7 +1191,7 @@
 
 int ocfs2_claim_metadata(ocfs2_super *osb,
 			 struct ocfs2_journal_handle *handle,
-			 ocfs2_alloc_context *ac,
+			 struct ocfs2_alloc_context *ac,
 			 u32 bits_wanted,
 			 u16 *suballoc_bit_start,
 			 unsigned int *num_bits,
@@ -1228,7 +1228,7 @@
 
 int ocfs2_claim_new_inode(ocfs2_super *osb,
 			  struct ocfs2_journal_handle *handle,
-			  ocfs2_alloc_context *ac,
+			  struct ocfs2_alloc_context *ac,
 			  u16 *suballoc_bit,
 			  u64 *fe_blkno)
 {
@@ -1331,7 +1331,7 @@
  */
 int ocfs2_claim_clusters(ocfs2_super *osb,
 			 struct ocfs2_journal_handle *handle,
-			 ocfs2_alloc_context *ac,
+			 struct ocfs2_alloc_context *ac,
 			 u32 min_clusters,
 			 u32 *cluster_start,
 			 u32 *num_clusters)

Modified: branches/enotypedefs/fs/ocfs2/suballoc.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/suballoc.h	2005-11-08 21:42:56 UTC (rev 2682)
+++ branches/enotypedefs/fs/ocfs2/suballoc.h	2005-11-08 22:07:41 UTC (rev 2683)
@@ -33,7 +33,7 @@
 			     u16 *,
 			     u16 *);
 
-typedef struct _ocfs2_alloc_context {
+struct ocfs2_alloc_context {
 	struct inode *ac_inode;    /* which bitmap are we allocating from? */
 	struct buffer_head *ac_bh; /* file entry bh */
 	u32    ac_bits_wanted;
@@ -49,10 +49,10 @@
 	u16    ac_chain;
 	int    ac_allow_chain_relink;
 	group_search_t *ac_group_search;
-} ocfs2_alloc_context;
+};
 
-void ocfs2_free_alloc_context(ocfs2_alloc_context *ac);
-static inline int ocfs2_alloc_context_bits_left(ocfs2_alloc_context *ac)
+void ocfs2_free_alloc_context(struct ocfs2_alloc_context *ac);
+static inline int ocfs2_alloc_context_bits_left(struct ocfs2_alloc_context *ac)
 {
 	return ac->ac_bits_wanted - ac->ac_bits_given;
 }
@@ -60,30 +60,30 @@
 int ocfs2_reserve_new_metadata(ocfs2_super *osb,
 			       struct ocfs2_journal_handle *handle,
 			       struct ocfs2_dinode *fe,
-			       ocfs2_alloc_context **ac);
+			       struct ocfs2_alloc_context **ac);
 int ocfs2_reserve_new_inode(ocfs2_super *osb,
 			    struct ocfs2_journal_handle *handle,
-			    ocfs2_alloc_context **ac);
+			    struct ocfs2_alloc_context **ac);
 int ocfs2_reserve_clusters(ocfs2_super *osb,
 			   struct ocfs2_journal_handle *handle,
 			   u32 bits_wanted,
-			   ocfs2_alloc_context **ac);
+			   struct ocfs2_alloc_context **ac);
 
 int ocfs2_claim_metadata(ocfs2_super *osb,
 			 struct ocfs2_journal_handle *handle,
-			 ocfs2_alloc_context *ac,
+			 struct ocfs2_alloc_context *ac,
 			 u32 bits_wanted,
 			 u16 *suballoc_bit_start,
 			 u32 *num_bits,
 			 u64 *blkno_start);
 int ocfs2_claim_new_inode(ocfs2_super *osb,
 			  struct ocfs2_journal_handle *handle,
-			  ocfs2_alloc_context *ac,
+			  struct ocfs2_alloc_context *ac,
 			  u16 *suballoc_bit,
 			  u64 *fe_blkno);
 int ocfs2_claim_clusters(ocfs2_super *osb,
 			 struct ocfs2_journal_handle *handle,
-			 ocfs2_alloc_context *ac,
+			 struct ocfs2_alloc_context *ac,
 			 u32 min_clusters,
 			 u32 *cluster_start,
 			 u32 *num_clusters);
@@ -127,6 +127,6 @@
 /* This is for local alloc ONLY. Others should use the task-specific
  * apis above. */
 int ocfs2_reserve_cluster_bitmap_bits(ocfs2_super *osb,
-				      ocfs2_alloc_context *ac);
+				      struct ocfs2_alloc_context *ac);
 
 #endif /* _CHAINALLOC_H_ */



More information about the Ocfs2-commits mailing list