[Ocfs2-commits] mfasheh commits r2623 - branches/ocfs2-1.2/fs/ocfs2

[svn-commits at oss.oracle.com]

Author: mfasheh
Signed-off-by: zab
Date: 2005-09-27 19:59:54 -0500 (Tue, 27 Sep 2005)
New Revision: 2623

Modified:
   branches/ocfs2-1.2/fs/ocfs2/dlmglue.c
   branches/ocfs2-1.2/fs/ocfs2/dlmglue.h
Log:
* Fixup dlmglue.h prototypes, missing from last backport             

* Backport svn r2622 from trunk:
        -We were shifting too far when packing and unpacking tv_sec for
         lvbs.

Signed-off-by: zab



Modified: branches/ocfs2-1.2/fs/ocfs2/dlmglue.c
===================================================================
--- branches/ocfs2-1.2/fs/ocfs2/dlmglue.c	2005-09-28 00:52:52 UTC (rev 2622)
+++ branches/ocfs2-1.2/fs/ocfs2/dlmglue.c	2005-09-28 00:59:54 UTC (rev 2623)
@@ -1248,8 +1248,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. */

Modified: branches/ocfs2-1.2/fs/ocfs2/dlmglue.h
===================================================================
--- branches/ocfs2-1.2/fs/ocfs2/dlmglue.h	2005-09-28 00:52:52 UTC (rev 2622)
+++ branches/ocfs2-1.2/fs/ocfs2/dlmglue.h	2005-09-28 00:59:54 UTC (rev 2623)
@@ -122,7 +122,7 @@
 void ocfs2_meta_lvb_set_trunc_clusters(struct inode *inode,
 				       unsigned int trunc_clusters);
 /* aids in debugging and tracking lvbs */
-void ocfs2_dump_meta_lvb_info(unsigned long level,
+void ocfs2_dump_meta_lvb_info(u64 level,
 			      const char *function,
 			      unsigned int line,
 			      struct ocfs2_lock_res *lockres);