[Ocfs2-commits] jlbec commits r973 - in trunk/src: . inc

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2004-06-02 13:40:55 -0500 (Wed, 02 Jun 2004)
New Revision: 973

Modified:
   trunk/src/dlm.c
   trunk/src/file.c
   trunk/src/inc/ocfs.h
   trunk/src/inode.c
   trunk/src/namei.c
Log:

o All DISK_LOCK_FOO now really gone.



Modified: trunk/src/dlm.c
===================================================================
--- trunk/src/dlm.c	2004-06-02 18:19:49 UTC (rev 972)
+++ trunk/src/dlm.c	2004-06-02 18:40:55 UTC (rev 973)
@@ -680,13 +680,13 @@
 	}
 
 	if (flags & DLOCK_FLAG_SEQ_NUM &&
-	    DISK_LOCK_SEQNUM (fe) != lockres->last_upd_seq_num) {
+	    DISK_LOCK(fe)->dlock_seq_num != lockres->last_upd_seq_num) {
 		if (!changed) {
 			OCFS_BH_PUT_DATA(*bh);
 			fe = (ocfs_file_entry *)OCFS_BH_GET_DATA_WRITE(*bh); /* write */
 		}
 		changed = 1;
-		DISK_LOCK_SEQNUM (fe) = lockres->last_upd_seq_num;
+		DISK_LOCK(fe)->dlock_seq_num = lockres->last_upd_seq_num;
 	}
 
 	OCFS_BH_PUT_DATA(*bh);

Modified: trunk/src/file.c
===================================================================
--- trunk/src/file.c	2004-06-02 18:19:49 UTC (rev 972)
+++ trunk/src/file.c	2004-06-02 18:40:55 UTC (rev 973)
@@ -124,7 +124,7 @@
 
 	/* why do we update these here? */
 	OCFS_I(inode)->alloc_size = fe->alloc_size;
-	OCFS_I(inode)->chng_seq_num = DISK_LOCK_SEQNUM (fe);
+	OCFS_I(inode)->chng_seq_num = DISK_LOCK(fe)->dlock_seq_num;
 	if (fe->this_sector == 0)
 		LOG_ERROR_STR ("this_sector=0");
 
@@ -661,7 +661,7 @@
 
 	fileEntry->modify_time = OCFS_CURRENT_TIME;
 
-	DISK_LOCK_SEQNUM (fileEntry) = 0;
+	DISK_LOCK(fileEntry)->dlock_seq_num = 0;
 	OCFS_FE_SET_ATTRIBUTES(fileEntry, attr);
 
 	/* Set the valid bit here */
@@ -1052,7 +1052,7 @@
 		goto leave;
 	}
 
-	DISK_LOCK_SEQNUM (fe) = 0;
+	DISK_LOCK(fe)->dlock_seq_num = 0;
 	SET_VALID_BIT (fe->sync_flags);
 	fe->sync_flags &= ~(OCFS_SYNC_FLAG_CHANGE);
 	fe->modify_time = OCFS_CURRENT_TIME;
@@ -1282,7 +1282,7 @@
 		up (&(OCFS_I(inode)->priv_sem));
 
 		/* no need to do OCFS_SECTOR_ALIGN once the allocation size is correct. */
-		DISK_LOCK_SEQNUM (fileEntry) = 0;
+		DISK_LOCK(fileEntry)->dlock_seq_num = 0;
 	}
 
 	/* Update tha file size and add the new one to old one. */

Modified: trunk/src/inc/ocfs.h
===================================================================
--- trunk/src/inc/ocfs.h	2004-06-02 18:19:49 UTC (rev 972)
+++ trunk/src/inc/ocfs.h	2004-06-02 18:40:55 UTC (rev 973)
@@ -643,12 +643,6 @@
 				DLOCK_FLAG_LAST_UPDATE)
 
 
-#define DISK_LOCK(x)	((ocfs_disk_lock *)&(x)->disk_lock)
-#define DISK_LOCK_CURRENT_MASTER(x)   ( ((ocfs_disk_lock *)x)->curr_master )
-#define DISK_LOCK_OIN_MAP(x)          ( ((ocfs_disk_lock *)x)->oin_node_map )
-#define DISK_LOCK_FILE_LOCK(x)        ( ((ocfs_disk_lock *)x)->file_lock )
-#define DISK_LOCK_SEQNUM(x)           ( ((ocfs_disk_lock *)x)->dlock_seq_num )
-
 #define MAX_VOL_ID_LENGTH		16
 #define MAX_VOL_LABEL_LEN		64
 #define MAX_CLUSTER_NAME_LEN		64
@@ -975,6 +969,8 @@
 
 #define OCFS_I(i)        ((ocfs_inode_private *)(i->u.generic_ip))
 
+#define DISK_LOCK(x)	((ocfs_disk_lock *)&(x)->disk_lock)
+
 #define GET_INODE_CLEAN_SEQ(i)  (atomic_t *)(&(OCFS_I(i)->i_clean_buffer_seq))
 
 
@@ -1716,8 +1712,8 @@
 #define OCFS_FE_CACHE_FLAGS(__osb, __fe)				  \
 ({									  \
 	int __ret = 0;							  \
-	if ((DISK_LOCK_FILE_LOCK(__fe)  == OCFS_DLM_ENABLE_CACHE_LOCK) && \
-	    (DISK_LOCK_CURRENT_MASTER(__fe) == osb->node_num) &&          \
+	if ((DISK_LOCK(__fe)->file_lock  == OCFS_DLM_ENABLE_CACHE_LOCK) && \
+	    (DISK_LOCK(__fe)->curr_master == osb->node_num) &&          \
 	    (__fe->this_sector >= __osb->vol_layout.bitmap_off))          \
 		__ret = OCFS_BH_CACHED;				  	  \
 	__ret;								  \

Modified: trunk/src/inode.c
===================================================================
--- trunk/src/inode.c	2004-06-02 18:19:49 UTC (rev 972)
+++ trunk/src/inode.c	2004-06-02 18:40:55 UTC (rev 973)
@@ -413,7 +413,7 @@
 
 	OCFS_I(inode)->alloc_size = fe->alloc_size;
 	OCFS_I(inode)->inode = inode;
-	OCFS_I(inode)->chng_seq_num = DISK_LOCK_SEQNUM (fe);
+	OCFS_I(inode)->chng_seq_num = DISK_LOCK(fe)->dlock_seq_num;
 	OCFS_I(inode)->u.fe_private = fe->u.fe_private;
 
 	if (fe->attribs & OCFS_ATTRIB_DIRECTORY)
@@ -1844,7 +1844,7 @@
 
 	if ((OCFS_I(inode)->alloc_size != (__s64) fe->alloc_size) ||
 	    (inode->i_size != (__s64) fe->file_size) ||
-	    (OCFS_I(inode)->chng_seq_num != DISK_LOCK_SEQNUM (fe)) ||
+	    (OCFS_I(inode)->chng_seq_num != DISK_LOCK(fe)->dlock_seq_num) ||
 	    inode->i_uid != fe->uid ||
 	    inode->i_gid != fe->gid || 
 	    inode->i_mode != fe->prot_bits ||
@@ -1860,7 +1860,7 @@
 		inode->i_size = fe->file_size;
 printk("verifyupdate: setting nlink from %d to %d for %llu\n", inode->i_nlink, fe->link_cnt, GET_INODE_FEOFF(inode));
 		inode->i_nlink = fe->link_cnt;
-		OCFS_I(inode)->chng_seq_num = DISK_LOCK_SEQNUM (fe);
+		OCFS_I(inode)->chng_seq_num = DISK_LOCK(fe)->dlock_seq_num;
 		inode->i_blocks = (inode->i_size + osb->sect_size) >> osb->sect_size_bits;
 		inode->i_uid = fe->uid;
 		inode->i_gid = fe->gid;
@@ -1872,7 +1872,7 @@
 		if (!S_ISDIR (inode->i_mode) &&
 		    (OCFS_I(inode)->alloc_size != (__s64) fe->alloc_size ||
 		     inode->i_size != (__s64) fe->file_size ||
-		     OCFS_I(inode)->chng_seq_num != DISK_LOCK_SEQNUM (fe))) {
+		     OCFS_I(inode)->chng_seq_num != DISK_LOCK(fe)->dlock_seq_num)) {
 			*needs_trunc = 1;
 		}
 

Modified: trunk/src/namei.c
===================================================================
--- trunk/src/namei.c	2004-06-02 18:19:49 UTC (rev 972)
+++ trunk/src/namei.c	2004-06-02 18:40:55 UTC (rev 973)
@@ -403,7 +403,7 @@
 	strcpy (fe->signature, OCFS_FILE_ENTRY_SIGNATURE);
 	SET_VALID_BIT (fe->sync_flags);
 	fe->sync_flags &= ~(OCFS_SYNC_FLAG_CHANGE);
-	DISK_LOCK_SEQNUM (fe) = 0;
+	DISK_LOCK(fe)->dlock_seq_num = 0;
 	DISK_LOCK(fe)->curr_master = osb->node_num;
 	DISK_LOCK(fe)->file_lock = OCFS_DLM_ENABLE_CACHE_LOCK;
 	DISK_LOCK(fe)->oin_node_map = (1 << osb->node_num);