diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-26 03:21:30 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-03 22:55:09 -0500 |
commit | dacd0e7b392dfaf888461741dbcaccf8b6a15bac (patch) | |
tree | 10a942abbc6980405e718f0089faf18bdbc41ce9 /fs/fat/fat.h | |
parent | d0c00d0671fbbaf6c5e192544de551a6ea5c8833 (diff) |
fat: propagate umode_t
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/fat/fat.h')
-rw-r--r-- | fs/fat/fat.h | 6 |
1 files changed, 3 insertions, 3 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; |