[Ocfs2-tools-commits] mfasheh commits r922 - in trunk: fsck.ocfs2 libocfs2/include

[svn-commits at oss.oracle.com]

Author: mfasheh
Signed-off-by: manish
Date: 2005-06-01 20:16:14 -0500 (Wed, 01 Jun 2005)
New Revision: 922

Modified:
   trunk/fsck.ocfs2/util.c
   trunk/libocfs2/include/ocfs2_fs.h
Log:
* update ocfs2_fs.h to track kernel

Signed-off-by: manish



Modified: trunk/fsck.ocfs2/util.c
===================================================================
--- trunk/fsck.ocfs2/util.c	2005-06-02 01:11:23 UTC (rev 921)
+++ trunk/fsck.ocfs2/util.c	2005-06-02 01:16:14 UTC (rev 922)
@@ -94,7 +94,7 @@
 	}
 
 	dinode = (ocfs2_dinode *)buf; 
-	*type = ocfs_type_by_mode[(dinode->i_mode & S_IFMT)>>S_SHIFT];
+	*type = ocfs2_type_by_mode[(dinode->i_mode & S_IFMT)>>S_SHIFT];
 
 out:
 	if (buf)

Modified: trunk/libocfs2/include/ocfs2_fs.h
===================================================================
--- trunk/libocfs2/include/ocfs2_fs.h	2005-06-02 01:11:23 UTC (rev 921)
+++ trunk/libocfs2/include/ocfs2_fs.h	2005-06-02 01:16:14 UTC (rev 922)
@@ -221,7 +221,7 @@
 #define OCFS2_LINK_MAX		32000
 
 #define S_SHIFT			12
-static unsigned char ocfs_type_by_mode[S_IFMT >> S_SHIFT] = {
+static unsigned char ocfs2_type_by_mode[S_IFMT >> S_SHIFT] = {
 	[S_IFREG >> S_SHIFT]  = OCFS2_FT_REG_FILE,
 	[S_IFDIR >> S_SHIFT]  = OCFS2_FT_DIR,
 	[S_IFCHR >> S_SHIFT]  = OCFS2_FT_CHRDEV,
@@ -633,10 +633,10 @@
 	return chars;
 }
 
-static inline void ocfs_set_de_type(struct ocfs2_dir_entry *de,
+static inline void ocfs2_set_de_type(struct ocfs2_dir_entry *de,
 				    umode_t mode)
 {
-	de->file_type = ocfs_type_by_mode[(mode & S_IFMT)>>S_SHIFT];
+	de->file_type = ocfs2_type_by_mode[(mode & S_IFMT)>>S_SHIFT];
 }
 
 #endif  /* _OCFS2_FS_H */