[Ocfs2-commits] mfasheh commits r2346 - trunk/fs/ocfs2

[svn-commits at oss.oracle.com]

Author: mfasheh
Signed-off-by: manish
Date: 2005-05-31 20:47:30 -0500 (Tue, 31 May 2005)
New Revision: 2346

Modified:
   trunk/fs/ocfs2/buffer_head_io.c
   trunk/fs/ocfs2/buffer_head_io.h
   trunk/fs/ocfs2/dir.c
   trunk/fs/ocfs2/namei.c
   trunk/fs/ocfs2/suballoc.c
Log:
* inlines should not be in all upper case

Signed-off-by: manish



Modified: trunk/fs/ocfs2/buffer_head_io.c
===================================================================
--- trunk/fs/ocfs2/buffer_head_io.c	2005-06-01 01:46:12 UTC (rev 2345)
+++ trunk/fs/ocfs2/buffer_head_io.c	2005-06-01 01:47:30 UTC (rev 2346)
@@ -42,9 +42,6 @@
 void ocfs_end_buffer_io_sync(struct buffer_head *bh,
 			     int uptodate)
 {
-//	mlog_entry("(bh->b_blocknr = %u, uptodate = %d)\n", bh->b_blocknr,
-//		   uptodate);
-
 	if (!uptodate)
 		mlog_errno(-EIO);
 
@@ -53,8 +50,6 @@
 	else
 		clear_buffer_uptodate(bh);
 	unlock_buffer(bh);
-
-//	mlog_exit_void();
 }
 
 int ocfs_write_blocks(ocfs_super *osb, struct buffer_head *bhs[], 
@@ -120,9 +115,9 @@
 		wait_on_buffer(bh);
 
 		if (inode)
-			SET_BH_SEQNUM(inode, bh);
+			ocfs2_set_bh_seqnum(inode, bh);
 		else
-			CLEAR_BH_SEQNUM(bh);
+			ocfs2_clear_bh_seqnum(bh);
 	}
 	if (inode)
 		up(&OCFS2_I(inode)->ip_io_sem);
@@ -187,7 +182,7 @@
 		ignore_cache = 0;
 
 		if (flags & OCFS_BH_CACHED && inode && 
-		    !TEST_BH_SEQNUM(inode, bh)) {
+		    !ocfs2_test_bh_seqnum(inode, bh)) {
 			mlog(ML_SEQNUM, "(read) bh (%llu) seqnum (%lu) does "
 					"not match inode (%u)\n",
 			     (unsigned long long)bh->b_blocknr, 
@@ -253,9 +248,9 @@
 		wait_on_buffer(bh);
 
 		if (inode)
-			SET_BH_SEQNUM(inode, bh);
+			ocfs2_set_bh_seqnum(inode, bh);
 		else
-			CLEAR_BH_SEQNUM(bh);
+			ocfs2_clear_bh_seqnum(bh);
 	}
 	if (inode)
 		up(&OCFS2_I(inode)->ip_io_sem);

Modified: trunk/fs/ocfs2/buffer_head_io.h
===================================================================
--- trunk/fs/ocfs2/buffer_head_io.h	2005-06-01 01:46:12 UTC (rev 2345)
+++ trunk/fs/ocfs2/buffer_head_io.h	2005-06-01 01:47:30 UTC (rev 2346)
@@ -69,22 +69,24 @@
 	return atomic_read(&OCFS2_I(inode)->ip_clean_buffer_seq);
 }
 
-static inline void CLEAR_BH_SEQNUM(struct buffer_head *bh)
+static inline void ocfs2_clear_bh_seqnum(struct buffer_head *bh)
 {
 	unsigned int prev = bh->b_state & STATE_BIT_MASK;
 	bh->b_state &= ~prev;
 }
 
-static inline void SET_BH_SEQNUM(struct inode *inode, struct buffer_head *bh)
+static inline void ocfs2_set_bh_seqnum(struct inode *inode,
+				       struct buffer_head *bh)
 {
 	unsigned int seq = (ocfs2_get_inode_seq(inode) & 
 			    STATE_BIT_MAX_MASK) << USED_BH_BITS;
 
-	CLEAR_BH_SEQNUM(bh);
+	ocfs2_clear_bh_seqnum(bh);
 	bh->b_state |= seq;
 }
 
-static inline int TEST_BH_SEQNUM(struct inode *inode, struct buffer_head *bh)
+static inline int ocfs2_test_bh_seqnum(struct inode *inode,
+				       struct buffer_head *bh)
 {
 	int ret;
 	unsigned int seq =

Modified: trunk/fs/ocfs2/dir.c
===================================================================
--- trunk/fs/ocfs2/dir.c	2005-06-01 01:46:12 UTC (rev 2345)
+++ trunk/fs/ocfs2/dir.c	2005-06-01 01:47:30 UTC (rev 2346)
@@ -449,7 +449,7 @@
 	}
 
 	set_buffer_uptodate(new_bh);
-	SET_BH_SEQNUM(dir, new_bh);
+	ocfs2_set_bh_seqnum(dir, new_bh);
 	status = ocfs_journal_access(handle, dir, new_bh, 
 				     OCFS_JOURNAL_ACCESS_CREATE);
 	if (status < 0) {

Modified: trunk/fs/ocfs2/namei.c
===================================================================
--- trunk/fs/ocfs2/namei.c	2005-06-01 01:46:12 UTC (rev 2345)
+++ trunk/fs/ocfs2/namei.c	2005-06-01 01:47:30 UTC (rev 2346)
@@ -256,7 +256,7 @@
 	}
 
 	set_buffer_uptodate(new_bh);
-	SET_BH_SEQNUM(inode, new_bh);
+	ocfs2_set_bh_seqnum(inode, new_bh);
 	status = ocfs_journal_access(handle, inode, new_bh, 
 				     OCFS_JOURNAL_ACCESS_CREATE);
 	if (status < 0) {
@@ -525,7 +525,7 @@
 		goto leave;
 	}
 	set_buffer_uptodate(*new_fe_bh);
-	SET_BH_SEQNUM(inode, *new_fe_bh);
+	ocfs2_set_bh_seqnum(inode, *new_fe_bh);
 
 	status = ocfs_journal_access(handle, inode, *new_fe_bh,
 				     OCFS_JOURNAL_ACCESS_CREATE);
@@ -1443,7 +1443,7 @@
 		}
 
 		set_buffer_uptodate(bhs[virtual]);
-		SET_BH_SEQNUM(inode, bhs[virtual]);
+		ocfs2_set_bh_seqnum(inode, bhs[virtual]);
 		status = ocfs_journal_access(handle, inode, bhs[virtual], 
 					     OCFS_JOURNAL_ACCESS_CREATE);
 		if (status < 0) {

Modified: trunk/fs/ocfs2/suballoc.c
===================================================================
--- trunk/fs/ocfs2/suballoc.c	2005-06-01 01:46:12 UTC (rev 2345)
+++ trunk/fs/ocfs2/suballoc.c	2005-06-01 01:47:30 UTC (rev 2346)
@@ -274,7 +274,7 @@
 		goto bail;
 	}
 	set_buffer_uptodate(bg_bh);
-	SET_BH_SEQNUM(alloc_inode, bg_bh);
+	ocfs2_set_bh_seqnum(alloc_inode, bg_bh);
 
 	status = ocfs2_block_group_fill(handle, 
 					alloc_inode,