diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-26 02:46:18 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-03 22:54:58 -0500 |
commit | 3ea40bc9471ae5a24b7e07cbf085fcd3c9572c91 (patch) | |
tree | 6fa49c8f4996d7a284d375aaef30b4c60ab581e2 | |
parent | c2837de73e8081bd33bc72ad73f49d6bcba9d1b6 (diff) |
ext2: propagate umode_t
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | fs/ext2/dir.c | 2 | ||||
-rw-r--r-- | fs/ext2/ext2.h | 2 | ||||
-rw-r--r-- | fs/ext2/ialloc.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext2/dir.c b/fs/ext2/dir.c index 47cda410b548..d37df352d324 100644 --- a/fs/ext2/dir.c +++ b/fs/ext2/dir.c | |||
@@ -279,7 +279,7 @@ static unsigned char ext2_type_by_mode[S_IFMT >> S_SHIFT] = { | |||
279 | 279 | ||
280 | static inline void ext2_set_de_type(ext2_dirent *de, struct inode *inode) | 280 | static inline void ext2_set_de_type(ext2_dirent *de, struct inode *inode) |
281 | { | 281 | { |
282 | mode_t mode = inode->i_mode; | 282 | umode_t mode = inode->i_mode; |
283 | if (EXT2_HAS_INCOMPAT_FEATURE(inode->i_sb, EXT2_FEATURE_INCOMPAT_FILETYPE)) | 283 | if (EXT2_HAS_INCOMPAT_FEATURE(inode->i_sb, EXT2_FEATURE_INCOMPAT_FILETYPE)) |
284 | de->file_type = ext2_type_by_mode[(mode & S_IFMT)>>S_SHIFT]; | 284 | de->file_type = ext2_type_by_mode[(mode & S_IFMT)>>S_SHIFT]; |
285 | else | 285 | else |
diff --git a/fs/ext2/ext2.h b/fs/ext2/ext2.h index 9a4e5e206d08..75ad433c6691 100644 --- a/fs/ext2/ext2.h +++ b/fs/ext2/ext2.h | |||
@@ -110,7 +110,7 @@ extern struct ext2_dir_entry_2 * ext2_dotdot (struct inode *, struct page **); | |||
110 | extern void ext2_set_link(struct inode *, struct ext2_dir_entry_2 *, struct page *, struct inode *, int); | 110 | extern void ext2_set_link(struct inode *, struct ext2_dir_entry_2 *, struct page *, struct inode *, int); |
111 | 111 | ||
112 | /* ialloc.c */ | 112 | /* ialloc.c */ |
113 | extern struct inode * ext2_new_inode (struct inode *, int, const struct qstr *); | 113 | extern struct inode * ext2_new_inode (struct inode *, umode_t, const struct qstr *); |
114 | extern void ext2_free_inode (struct inode *); | 114 | extern void ext2_free_inode (struct inode *); |
115 | extern unsigned long ext2_count_free_inodes (struct super_block *); | 115 | extern unsigned long ext2_count_free_inodes (struct super_block *); |
116 | extern void ext2_check_inodes_bitmap (struct super_block *); | 116 | extern void ext2_check_inodes_bitmap (struct super_block *); |
diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c index c4e81dfb74ba..cd7f5f424a75 100644 --- a/fs/ext2/ialloc.c +++ b/fs/ext2/ialloc.c | |||
@@ -429,7 +429,7 @@ found: | |||
429 | return group; | 429 | return group; |
430 | } | 430 | } |
431 | 431 | ||
432 | struct inode *ext2_new_inode(struct inode *dir, int mode, | 432 | struct inode *ext2_new_inode(struct inode *dir, umode_t mode, |
433 | const struct qstr *qstr) | 433 | const struct qstr *qstr) |
434 | { | 434 | { |
435 | struct super_block *sb; | 435 | struct super_block *sb; |