[Ocfs2-commits] mfasheh commits r832 - in branches/nooin/src: . inc

svn-commits at oss.oracle.com svn-commits at oss.oracle.com
Thu Apr 1 12:13:20 CST 2004


Author: mfasheh
Date: 2004-04-01 12:13:18 -0600 (Thu, 01 Apr 2004)
New Revision: 832

Modified:
   branches/nooin/src/alloc.c
   branches/nooin/src/file.c
   branches/nooin/src/inc/ocfs.h
   branches/nooin/src/inode.c
   branches/nooin/src/journal.c
   branches/nooin/src/oin.c
Log:
* remove the oin->cache_enabled flag as it was unused.

* create a generic inode_private_data->flags field and move
  oin->journal_inode and private_data->deleted onto it.



Modified: branches/nooin/src/alloc.c
===================================================================
--- branches/nooin/src/alloc.c	2004-03-31 22:58:30 UTC (rev 831)
+++ branches/nooin/src/alloc.c	2004-04-01 18:13:18 UTC (rev 832)
@@ -2476,8 +2476,9 @@
 
 	OCFS_ASSERT (osb);
 	OCFS_ASSERT (oin);
+	OCFS_ASSERT (inode);
 
-	if (oin->journal_inode || Vbo < oin->alloc_size) {
+	if (INODE_JOURNAL(inode) || Vbo < oin->alloc_size) {
 		if (ocfs_lookup_extent_map_entry (osb, &(oin->map), 
 			   Vbo, Lbo, &cnt, &NumIndex) && cnt >= sectors) {
 			status = 0;
@@ -2485,8 +2486,6 @@
 		}
 	}
 
-	OCFS_ASSERT (inode);
-
 	remainingLength = sectors;
 	localVbo = Vbo;
 	    		
@@ -2507,7 +2506,7 @@
 		goto finally;
 	}
 
-	if (!oin->journal_inode && Vbo >= (__s64) fe->alloc_size) {
+	if (!INODE_JOURNAL(inode) && Vbo >= (__s64) fe->alloc_size) {
 		LOG_ERROR_ARGS ("vbo=%u.%u, fe->alloc_sz=%u.%u oin->alloc_size=%u.%u", 
 				HILO (Vbo), HILO (fe->alloc_size),
 				HILO (oin->alloc_size));

Modified: branches/nooin/src/file.c
===================================================================
--- branches/nooin/src/file.c	2004-03-31 22:58:30 UTC (rev 831)
+++ branches/nooin/src/file.c	2004-04-01 18:13:18 UTC (rev 832)
@@ -666,13 +666,6 @@
 
 	ocfs_get_lockres (lockres);
 
-	if ((lockres->master_node_num != osb->node_num) ||
-	    (lockres->lock_type != OCFS_DLM_ENABLE_CACHE_LOCK)) {
-		oin->cache_enabled = false;
-	} else {
-		oin->cache_enabled = true;
-	}
-
 	if (osb->osb_flags & OCFS_OSB_FLAGS_SHUTDOWN) {
 		LOG_TRACE_STR ("Volume has already started shutdown");
 		ret = -EIO;
@@ -796,15 +789,6 @@
 		OCFS_CLEAR_FLAG(oin->oin_flags, OCFS_OIN_OPEN_FOR_WRITE);
 	}
 
-#if 0
-        if (inode && oin && !oin->cache_enabled && !(filp->f_flags & O_DIRECT)) {
-                fsync_inode_buffers(inode);
-#if LINUX_VERSION_CODE >= LinuxVersionCode(2,4,18)
-		fsync_inode_data_buffers(inode);
-#endif
-        }
-#endif
-
 	ocfs_put_lockres (lockres);
 	
 	if (ret < 0)

Modified: branches/nooin/src/inc/ocfs.h
===================================================================
--- branches/nooin/src/inc/ocfs.h	2004-03-31 22:58:30 UTC (rev 831)
+++ branches/nooin/src/inc/ocfs.h	2004-04-01 18:13:18 UTC (rev 832)
@@ -246,19 +246,28 @@
 	__u64            voteoff;
 	__u64            feoff;
 	atomic_t         i_clean_buffer_seq;
-	__u8             deleted; /* this can be a generic flags field later */
+	__u32            flags; /* see below */
 } ocfs_inode_private;
 
+/* has this inode been deleted, either from this node or from another node. */
+#define OCFS_INODE_DELETED          0x00000001
+/* is this the journal inode? */
+#define OCFS_INODE_JOURNAL          0x00000002
+
 #define GET_INODE_CLEAN_SEQ(i)  (atomic_t *)(&(OCFS_GENERIC_IP(i)->i_clean_buffer_seq))
 
 #define OCFS_GENERIC_IP(i)        ((ocfs_inode_private *)(i->u.generic_ip))
 
 #define inode_data_is_oin(i)      (OCFS_GENERIC_IP(i)->oin != NULL)
 
-#define INODE_DELETED(i) (OCFS_GENERIC_IP(i)->deleted)
-#define SET_INODE_DELETED(i) OCFS_GENERIC_IP(i)->deleted = 1
-#define CLEAR_INODE_DELETED(i) OCFS_GENERIC_IP(i)->deleted = 0
+#define INODE_DELETED(i) (OCFS_GENERIC_IP(i)->flags & OCFS_INODE_DELETED)
+#define SET_INODE_DELETED(i) (OCFS_GENERIC_IP(i)->flags |= OCFS_INODE_DELETED)
+#define CLEAR_INODE_DELETED(i) (OCFS_GENERIC_IP(i)->flags &= (~OCFS_INODE_DELETED))
 
+#define INODE_JOURNAL(i) (OCFS_GENERIC_IP(i)->flags & OCFS_INODE_JOURNAL)
+#define SET_INODE_JOURNAL(i) (OCFS_GENERIC_IP(i)->flags |= OCFS_INODE_JOURNAL)
+#define CLEAR_INODE_JOURNAL(i) (OCFS_GENERIC_IP(i)->flags &= (~OCFS_INODE_JOURNAL))
+
 #define SET_INODE_VOTEOFF(i,o)						      \
 do {									      \
 	OCFS_GENERIC_IP(i)->voteoff = o;				      \
@@ -1835,8 +1844,6 @@
 	__u32 open_hndl_cnt;
 	__u32 oin_flags;
 	bool needs_verification;
-	bool cache_enabled;
-	bool journal_inode;    /* is this the journal oin? */
 };
 
 typedef enum _ocfs_vol_state

Modified: branches/nooin/src/inode.c
===================================================================
--- branches/nooin/src/inode.c	2004-03-31 22:58:30 UTC (rev 831)
+++ branches/nooin/src/inode.c	2004-04-01 18:13:18 UTC (rev 832)
@@ -1014,7 +1014,7 @@
 	osb = (ocfs_super *) oin->osb;
 	vbo = (__s64) iblock << inode->i_sb->s_blocksize_bits;
 
-	if (!oin->journal_inode && vbo >= oin->alloc_size) {
+	if (!INODE_JOURNAL(inode) && vbo >= oin->alloc_size) {
 		LOG_TRACE_STR("Extending allocation");
 		err = ocfs_extend_allocation(osb, oin, vbo+512, false, inode);
 		if (err < 0) {
@@ -1088,7 +1088,7 @@
 
 	oin = GET_INODE_OIN(inode);
 
-	if (!(oin->journal_inode)) {
+	if (!INODE_JOURNAL(inode)) {
 		LOG_ERROR_STR("bmap is only for journal inodes!");
 		err = -EINVAL;
 		LOG_ERROR_STATUS(err);

Modified: branches/nooin/src/journal.c
===================================================================
--- branches/nooin/src/journal.c	2004-03-31 22:58:30 UTC (rev 831)
+++ branches/nooin/src/journal.c	2004-04-01 18:13:18 UTC (rev 832)
@@ -940,9 +940,9 @@
 
 	status = ocfs_create_new_oin(&oin, alloc_size, osb);
 	status = ocfs_initialize_oin(oin, osb, 0, lock_id, lock_id, false, NULL);
-	oin->journal_inode = true;
 	oin->open_hndl_cnt++;
 	SET_INODE_OIN(inode, oin);
+	SET_INODE_JOURNAL(inode);
 	LOG_TRACE_ARGS("oin->alloc_size = %u.%u\n", HI(oin->alloc_size), 
 		       LO(oin->alloc_size));
 
@@ -1580,8 +1580,8 @@
 	}
 	status = ocfs_initialize_oin(oin, osb, 0, lock_id, lock_id, false, 
 				     NULL);
-	oin->journal_inode = true;
 	SET_INODE_OIN(inode, oin);
+	SET_INODE_JOURNAL(inode);
 
 	status = ocfs_force_read_journal(osb, inode->i_size, oin, inode);
 	if (status < 0) {

Modified: branches/nooin/src/oin.c
===================================================================
--- branches/nooin/src/oin.c	2004-03-31 22:58:30 UTC (rev 831)
+++ branches/nooin/src/oin.c	2004-04-01 18:13:18 UTC (rev 832)
@@ -470,7 +470,6 @@
 	oin->osb = osb;
 	oin->oin_flags |= flags;
 	oin->open_hndl_cnt = 0;
-	oin->journal_inode = false;
 	ocfs_extent_map_init (&oin->map);
 
 leave:



More information about the Ocfs2-commits mailing list