tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
fat: propagate umode_t
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
+5
-5
+3
-3
fs/fat/fat.h
+3
-3
fs/fat/fat.h
···
141
141
static inline int fat_mode_can_hold_ro(struct inode *inode)
142
142
{
143
143
struct msdos_sb_info *sbi = MSDOS_SB(inode->i_sb);
144
-
mode_t mask;
144
+
umode_t mask;
145
145
146
146
if (S_ISDIR(inode->i_mode)) {
147
147
if (!sbi->options.rodir)
···
156
156
}
157
157
158
158
/* Convert attribute bits and a mask to the UNIX mode. */
159
-
static inline mode_t fat_make_mode(struct msdos_sb_info *sbi,
160
-
u8 attrs, mode_t mode)
159
+
static inline umode_t fat_make_mode(struct msdos_sb_info *sbi,
160
+
u8 attrs, umode_t mode)
161
161
{
162
162
if (attrs & ATTR_RO && !((attrs & ATTR_DIR) && !sbi->options.rodir))
163
163
mode &= ~S_IWUGO;
+2
-2
fs/fat/file.c
+2
-2
fs/fat/file.c
···
314
314
static int fat_sanitize_mode(const struct msdos_sb_info *sbi,
315
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
320
* Note, the basic check is already done by a caller of
···
351
351
352
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
356
if (current_fsuid() != inode->i_uid) {
357
357
if (in_group_p(inode->i_gid))