[Ocfs2-commits] zab commits r1645 - trunk/src

[svn-commits at oss.oracle.com]

Author: zab
Date: 2004-11-12 18:18:04 -0600 (Fri, 12 Nov 2004)
New Revision: 1645

Modified:
   trunk/src/ocfs2_fs.h
Log:
o sync ocfs2_fs.h up with ocfs2-tools


Modified: trunk/src/ocfs2_fs.h
===================================================================
--- trunk/src/ocfs2_fs.h	2004-11-12 00:23:50 UTC (rev 1644)
+++ trunk/src/ocfs2_fs.h	2004-11-13 00:18:04 UTC (rev 1645)
@@ -111,7 +111,6 @@
 #define OCFS2_DEFAULT_JOURNAL_SIZE	(8 * ONE_MEGA_BYTE)
 #define OCFS2_MIN_JOURNAL_SIZE		(4 * ONE_MEGA_BYTE)
 
-
 /* System file index */
 enum {
 	BAD_BLOCK_SYSTEM_INODE = 0,
@@ -169,9 +168,11 @@
  */
 #define OCFS2_DIR_PAD			4
 #define OCFS2_DIR_ROUND			(OCFS2_DIR_PAD - 1)
-#define OCFS2_DIR_REC_LEN(name_len)	(((name_len) + 12 + \
+#define OCFS2_DIR_MEMBER_LEN 		offsetof(struct ocfs2_dir_entry, name)
+#define OCFS2_DIR_REC_LEN(name_len)	(((name_len) + OCFS2_DIR_MEMBER_LEN + \
                                           OCFS2_DIR_ROUND) & \
 					 ~OCFS2_DIR_ROUND)
+
 #define OCFS2_LINK_MAX		32000
 
 #define S_SHIFT			12