[Ocfs2-commits] mfasheh commits r2637 - in branches/locking-changes: . fs/ocfs2 fs/ocfs2/cluster

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2005-10-04 18:31:02 -0500 (Tue, 04 Oct 2005)
New Revision: 2637

Modified:
   branches/locking-changes/configure.in
   branches/locking-changes/fs/ocfs2/cluster/heartbeat.c
   branches/locking-changes/fs/ocfs2/cluster/tcp_internal.h
   branches/locking-changes/fs/ocfs2/dlmglue.c
Log:
* Merge svn 2616:2630 from trunk. This actually puts us up to date with
  trunk r2633.
  -bump version
  -Fix a bio leak in ocfs_heartbeat.
  -Fix double spinlock in some debugging cases
  -Fix timespec packing code



Modified: branches/locking-changes/configure.in
===================================================================
--- branches/locking-changes/configure.in	2005-10-04 23:11:58 UTC (rev 2636)
+++ branches/locking-changes/configure.in	2005-10-04 23:31:02 UTC (rev 2637)
@@ -8,8 +8,8 @@
 
 # Adjust these for the software version.
 MAJOR_VERSION=1
-MINOR_VERSION=1
-MICRO_VERSION=4
+MINOR_VERSION=3
+MICRO_VERSION=0
 EXTRA_VERSION=
 
 # Adjust this only to bump the RPM packaging version

Modified: branches/locking-changes/fs/ocfs2/cluster/heartbeat.c
===================================================================
--- branches/locking-changes/fs/ocfs2/cluster/heartbeat.c	2005-10-04 23:11:58 UTC (rev 2636)
+++ branches/locking-changes/fs/ocfs2/cluster/heartbeat.c	2005-10-04 23:31:02 UTC (rev 2637)
@@ -383,7 +383,6 @@
 		}
 		bios[i] = bio;
 
-		bio_get(bio);
 		submit_bio(READ, bio);
 	}
 
@@ -421,7 +420,6 @@
 		goto bail;
 	}
 
-	bio_get(bio);
 	submit_bio(WRITE, bio);
 
 	*write_bio = bio;

Modified: branches/locking-changes/fs/ocfs2/cluster/tcp_internal.h
===================================================================
--- branches/locking-changes/fs/ocfs2/cluster/tcp_internal.h	2005-10-04 23:11:58 UTC (rev 2636)
+++ branches/locking-changes/fs/ocfs2/cluster/tcp_internal.h	2005-10-04 23:31:02 UTC (rev 2637)
@@ -22,8 +22,6 @@
 #ifndef O2CLUSTER_TCP_INTERNAL_H
 #define O2CLUSTER_TCP_INTERNAL_H
 
-#define O2NET_MAX_CONNECT_ATTEMPTS	5
-
 #define O2NET_MSG_MAGIC           ((u16)0xfa55)
 #define O2NET_MSG_STATUS_MAGIC    ((u16)0xfa56)
 #define O2NET_MSG_KEEP_REQ_MAGIC  ((u16)0xfa57)

Modified: branches/locking-changes/fs/ocfs2/dlmglue.c
===================================================================
--- branches/locking-changes/fs/ocfs2/dlmglue.c	2005-10-04 23:11:58 UTC (rev 2636)
+++ branches/locking-changes/fs/ocfs2/dlmglue.c	2005-10-04 23:31:02 UTC (rev 2637)
@@ -1276,8 +1276,9 @@
 	mlog_exit_void();
 }
 
-#define OCFS2_SEC_SHIFT  34
-#define OCFS2_NSEC_MASK  ((1ULL << (64 - OCFS2_SEC_SHIFT)) - 1)
+#define OCFS2_SEC_BITS   34
+#define OCFS2_SEC_SHIFT  (64 - 34)
+#define OCFS2_NSEC_MASK  ((1ULL << OCFS2_SEC_SHIFT) - 1)
 
 /* LVB only has room for 64 bits of time here so we pack it for
  * now. */
@@ -2653,8 +2654,8 @@
 
 	mlog(level, "LVB information for %s (called from %s:%u):\n",
 	     lockres->l_name, function, line);
-	mlog(level, "trustable: %s, seq: %u, size: %"MLFu64", clusters: %u\n",
-	     ocfs2_lvb_is_trustable(lockres) ? "yes" : "no",
+	mlog(level, "Lockres local seq: %u, seq: %u, size: %"MLFu64", "
+	     "clusters: %u\n", lockres->l_local_seq,
 	     be32_to_cpu(lvb->lvb.lvb_seq), be64_to_cpu(lvb->lvb_isize),
 	     be32_to_cpu(lvb->lvb_iclusters));
 	mlog(level, "trunc clusters %u, uid %u, gid %u, mode 0x%x\n",