[Ocfs2-commits] mfasheh commits r2355 - trunk/fs/ocfs2

[svn-commits at oss.oracle.com]

Author: mfasheh
Signed-off-by: manish
Date: 2005-06-01 20:15:53 -0500 (Wed, 01 Jun 2005)
New Revision: 2355

Modified:
   trunk/fs/ocfs2/namei.c
   trunk/fs/ocfs2/ocfs2_fs.h
Log:
* a couple things in ocfs2_fs.h were improperly prefixed. fix this.

Signed-off-by: manish



Modified: trunk/fs/ocfs2/namei.c
===================================================================
--- trunk/fs/ocfs2/namei.c	2005-06-02 01:03:54 UTC (rev 2354)
+++ trunk/fs/ocfs2/namei.c	2005-06-02 01:15:53 UTC (rev 2355)
@@ -271,14 +271,14 @@
 	de->rec_len =
 		cpu_to_le16(OCFS2_DIR_REC_LEN(de->name_len));
 	strcpy(de->name, ".");
-	ocfs_set_de_type(de, S_IFDIR);
+	ocfs2_set_de_type(de, S_IFDIR);
 	de = (struct ocfs2_dir_entry *) ((char *)de + le16_to_cpu(de->rec_len));
 	de->inode = cpu_to_le64(OCFS2_I(parent)->ip_blkno);
 	de->rec_len = cpu_to_le16(inode->i_sb->s_blocksize -
 				  OCFS2_DIR_REC_LEN(1));
 	de->name_len = 2;
 	strcpy(de->name, "..");
-	ocfs_set_de_type(de, S_IFDIR);
+	ocfs2_set_de_type(de, S_IFDIR);
 
 	status = ocfs_journal_dirty(handle, new_bh);	
 	if (status < 0) {
@@ -1753,7 +1753,7 @@
 			de->file_type = OCFS2_FT_UNKNOWN;
 			if (blkno) {
 				de->inode = cpu_to_le64(blkno);
-				ocfs_set_de_type(de, inode->i_mode);
+				ocfs2_set_de_type(de, inode->i_mode);
 			} else
 				de->inode = 0;
 			de->name_len = namelen;

Modified: trunk/fs/ocfs2/ocfs2_fs.h
===================================================================
--- trunk/fs/ocfs2/ocfs2_fs.h	2005-06-02 01:03:54 UTC (rev 2354)
+++ trunk/fs/ocfs2/ocfs2_fs.h	2005-06-02 01:15:53 UTC (rev 2355)
@@ -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 */