summaryrefslogtreecommitdiffstats
path: root/fs/fat/fat.h
diff options
context:
space:
mode:
authorAl Viro2011-07-26 09:21:30 +0200
committerAl Viro2012-01-04 04:55:09 +0100
commitdacd0e7b392dfaf888461741dbcaccf8b6a15bac (patch)
tree10a942abbc6980405e718f0089faf18bdbc41ce9 /fs/fat/fat.h
parentntfs: propagate umode_t (diff)
downloadkernel-qcow2-linux-dacd0e7b392dfaf888461741dbcaccf8b6a15bac.tar.gz
kernel-qcow2-linux-dacd0e7b392dfaf888461741dbcaccf8b6a15bac.tar.xz
kernel-qcow2-linux-dacd0e7b392dfaf888461741dbcaccf8b6a15bac.zip
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.h6
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)
static inline int fat_mode_can_hold_ro(struct inode *inode)
{
struct msdos_sb_info *sbi = MSDOS_SB(inode->i_sb);
- mode_t mask;
+ umode_t mask;
if (S_ISDIR(inode->i_mode)) {
if (!sbi->options.rodir)
@@ -156,8 +156,8 @@ static inline int fat_mode_can_hold_ro(struct inode *inode)
}
/* Convert attribute bits and a mask to the UNIX mode. */
-static inline mode_t fat_make_mode(struct msdos_sb_info *sbi,
- u8 attrs, mode_t mode)
+static inline umode_t fat_make_mode(struct msdos_sb_info *sbi,
+ u8 attrs, umode_t mode)
{
if (attrs & ATTR_RO && !((attrs & ATTR_DIR) && !sbi->options.rodir))
mode &= ~S_IWUGO;