---

yaml --- r: 280226 b: refs/heads/master c: 3ea40bc h: refs/heads/master v: v3
git-mirror · Jan 4, 2012 · 2f2c9a6 · 2f2c9a6
1 parent 5649823
commit 2f2c9a6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2837de73e8081bd33bc72ad73f49d6bcba9d1b6
+refs/heads/master: 3ea40bc9471ae5a24b7e07cbf085fcd3c9572c91
diff --git a/trunk/fs/ext2/dir.c b/trunk/fs/ext2/dir.c
@@ -279,7 +279,7 @@ static unsigned char ext2_type_by_mode[S_IFMT >> S_SHIFT] = {
 
 static inline void ext2_set_de_type(ext2_dirent *de, struct inode *inode)
 {
-	mode_t mode = inode->i_mode;
+	umode_t mode = inode->i_mode;
 	if (EXT2_HAS_INCOMPAT_FEATURE(inode->i_sb, EXT2_FEATURE_INCOMPAT_FILETYPE))
 		de->file_type = ext2_type_by_mode[(mode & S_IFMT)>>S_SHIFT];
 	else

diff --git a/trunk/fs/ext2/ext2.h b/trunk/fs/ext2/ext2.h
@@ -110,7 +110,7 @@ extern struct ext2_dir_entry_2 * ext2_dotdot (struct inode *, struct page **);
 extern void ext2_set_link(struct inode *, struct ext2_dir_entry_2 *, struct page *, struct inode *, int);
 
 /* ialloc.c */
-extern struct inode * ext2_new_inode (struct inode *, int, const struct qstr *);
+extern struct inode * ext2_new_inode (struct inode *, umode_t, const struct qstr *);
 extern void ext2_free_inode (struct inode *);
 extern unsigned long ext2_count_free_inodes (struct super_block *);
 extern void ext2_check_inodes_bitmap (struct super_block *);

diff --git a/trunk/fs/ext2/ialloc.c b/trunk/fs/ext2/ialloc.c
@@ -429,7 +429,7 @@ static int find_group_other(struct super_block *sb, struct inode *parent)
 	return group;
 }
 
-struct inode *ext2_new_inode(struct inode *dir, int mode,
+struct inode *ext2_new_inode(struct inode *dir, umode_t mode,
 			     const struct qstr *qstr)
 {
 	struct super_block *sb;