[Ocfs2-commits] mfasheh commits r1613 - branches/dlm-glue/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-11-01 19:01:01 -0600 (Mon, 01 Nov 2004)
New Revision: 1613

Modified:
   branches/dlm-glue/src/file.c
   branches/dlm-glue/src/ocfs.h
Log:
* don't need ip_open_flags anymore -- ip_flags will do fine for the
  OCFS_INODE_OPEN_DIRECT bit.



Modified: branches/dlm-glue/src/file.c
===================================================================
--- branches/dlm-glue/src/file.c	2004-11-02 00:59:55 UTC (rev 1612)
+++ branches/dlm-glue/src/file.c	2004-11-02 01:01:01 UTC (rev 1613)
@@ -108,15 +108,15 @@
 	spin_lock(&oip->ip_lock);
 	if (oip->ip_open_cnt &&
 	    !ocfs2_valid_open(mode, 
-			      oip->ip_open_flags & OCFS_INODE_OPEN_DIRECT)) {
+			      oip->ip_flags & OCFS_INODE_OPEN_DIRECT)) {
 		spin_unlock(&oip->ip_lock);
 		goto leave;
 	}
 
 	if (mode & O_DIRECT)
-		oip->ip_open_flags |= OCFS_INODE_OPEN_DIRECT;
+		oip->ip_flags |= OCFS_INODE_OPEN_DIRECT;
 	else
-		oip->ip_open_flags &= ~OCFS_INODE_OPEN_DIRECT;
+		oip->ip_flags &= ~OCFS_INODE_OPEN_DIRECT;
 
 	oip->ip_open_cnt++;
 	spin_unlock(&oip->ip_lock);
@@ -137,7 +137,7 @@
 
 	spin_lock(&oip->ip_lock);
 	if (!--oip->ip_open_cnt)
-		oip->ip_open_flags &= ~OCFS_INODE_OPEN_DIRECT;
+		oip->ip_flags &= ~OCFS_INODE_OPEN_DIRECT;
 	spin_unlock(&oip->ip_lock);
 
 	LOG_EXIT_INT(0);
@@ -1195,7 +1195,7 @@
 		spin_lock(&OCFS_I(inode)->ip_lock);
 		inode->i_size = newsize;
 		inode->i_blocks = (newsize + sb->s_blocksize - 1) >> sb->s_blocksize_bits;
-		if (OCFS_I(inode)->ip_open_flags & OCFS_INODE_OPEN_DIRECT) {
+		if (OCFS_I(inode)->ip_flags & OCFS_INODE_OPEN_DIRECT) {
 			/* This is a total broken hack for O_DIRECT crack */
 			OCFS_I(inode)->ip_mmu_private = inode->i_size;
 		}

Modified: branches/dlm-glue/src/ocfs.h
===================================================================
--- branches/dlm-glue/src/ocfs.h	2004-11-02 00:59:55 UTC (rev 1612)
+++ branches/dlm-glue/src/ocfs.h	2004-11-02 01:01:01 UTC (rev 1613)
@@ -262,10 +262,9 @@
 
 	/* These fields are protected by ip_lock */
 	spinlock_t	  ip_lock;
-	__u32             ip_open_cnt;
+	u32             ip_open_cnt;
 	u32		ip_clusters;
 	u64		ip_mmu_private;
-	__u32             ip_open_flags;
 	struct ocfs2_extent_map ip_map;
 
 	struct semaphore  ip_io_sem;
@@ -278,7 +277,7 @@
 	struct _ocfs_journal_handle *ip_handle;
 
 	atomic_t          ip_clean_buffer_seq;
-	__u32             ip_flags; /* see below */
+	u32             ip_flags; /* see below */
 
 	/* stolen right off of ocfs2_dinode */
 	union {
@@ -292,19 +291,13 @@
 	/* protected by recovery_lock. */
 	struct inode      *ip_next_orphan;
 
-	__u32 		  ip_dir_start_lookup;
+	u32 		  ip_dir_start_lookup;
 
 	/* protected by trans_inc_lock, which transaction were we
 	 * created on? Zero if none. */
 	unsigned long               ip_created_trans;
 } ocfs_inode_private;
 
-/* Eventually, the 'flags' and 'open_flags' fields need to be
- * merged. */
-/* open flags */
-#define  OCFS_INODE_OPEN_DIRECT                  (0x00000001)
-#define  OCFS_IN_FIRST_OPEN                      (0x00000002)
-
 /* 'flags' flags. */
 /* has this inode been deleted, either from this node or from another node. */
 #define OCFS_INODE_DELETED          0x00000001
@@ -318,6 +311,7 @@
 #define OCFS_INODE_SKIP_DELETE      0x00000010
 #define OCFS_INODE_IN_REFRESH       0x00000020
 #define OCFS_INODE_BITMAP           0x00000040
+#define OCFS_INODE_OPEN_DIRECT      0x00000080
 
 #define OCFS_I(i)        ((ocfs_inode_private *)(i->u.generic_ip))