diff options
-rw-r--r-- | fs/fat/fat.h | 6 | ||||
-rw-r--r-- | fs/fat/file.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/fs/fat/fat.h b/fs/fat/fat.h index 1510a4d51990..66994f316e18 100644 --- a/fs/fat/fat.h +++ b/fs/fat/fat.h | |||
@@ -141,7 +141,7 @@ static inline struct msdos_inode_info *MSDOS_I(struct inode *inode) | |||
141 | static inline int fat_mode_can_hold_ro(struct inode *inode) | 141 | static inline int fat_mode_can_hold_ro(struct inode *inode) |
142 | { | 142 | { |
143 | struct msdos_sb_info *sbi = MSDOS_SB(inode->i_sb); | 143 | struct msdos_sb_info *sbi = MSDOS_SB(inode->i_sb); |
144 | mode_t mask; | 144 | umode_t mask; |
145 | 145 | ||
146 | if (S_ISDIR(inode->i_mode)) { | 146 | if (S_ISDIR(inode->i_mode)) { |
147 | if (!sbi->options.rodir) | 147 | if (!sbi->options.rodir) |
@@ -156,8 +156,8 @@ static inline int fat_mode_can_hold_ro(struct inode *inode) | |||
156 | } | 156 | } |
157 | 157 | ||
158 | /* Convert attribute bits and a mask to the UNIX mode. */ | 158 | /* Convert attribute bits and a mask to the UNIX mode. */ |
159 | static inline mode_t fat_make_mode(struct msdos_sb_info *sbi, | 159 | static inline umode_t fat_make_mode(struct msdos_sb_info *sbi, |
160 | u8 attrs, mode_t mode) | 160 | u8 attrs, umode_t mode) |
161 | { | 161 | { |
162 | if (attrs & ATTR_RO && !((attrs & ATTR_DIR) && !sbi->options.rodir)) | 162 | if (attrs & ATTR_RO && !((attrs & ATTR_DIR) && !sbi->options.rodir)) |
163 | mode &= ~S_IWUGO; | 163 | mode &= ~S_IWUGO; |
diff --git a/fs/fat/file.c b/fs/fat/file.c index d81d01a99b2c..a71fe3715ee8 100644 --- a/fs/fat/file.c +++ b/fs/fat/file.c | |||
@@ -314,7 +314,7 @@ EXPORT_SYMBOL_GPL(fat_getattr); | |||
314 | static int fat_sanitize_mode(const struct msdos_sb_info *sbi, | 314 | static int fat_sanitize_mode(const struct msdos_sb_info *sbi, |
315 | struct inode *inode, umode_t *mode_ptr) | 315 | struct inode *inode, umode_t *mode_ptr) |
316 | { | 316 | { |
317 | mode_t mask, perm; | 317 | umode_t mask, perm; |
318 | 318 | ||
319 | /* | 319 | /* |
320 | * Note, the basic check is already done by a caller of | 320 | * Note, the basic check is already done by a caller of |
@@ -351,7 +351,7 @@ static int fat_sanitize_mode(const struct msdos_sb_info *sbi, | |||
351 | 351 | ||
352 | static int fat_allow_set_time(struct msdos_sb_info *sbi, struct inode *inode) | 352 | static int fat_allow_set_time(struct msdos_sb_info *sbi, struct inode *inode) |
353 | { | 353 | { |
354 | mode_t allow_utime = sbi->options.allow_utime; | 354 | umode_t allow_utime = sbi->options.allow_utime; |
355 | 355 | ||
356 | if (current_fsuid() != inode->i_uid) { | 356 | if (current_fsuid() != inode->i_uid) { |
357 | if (in_group_p(inode->i_gid)) | 357 | if (in_group_p(inode->i_gid)) |