renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-11-18 07:35:12 +08:00
Code

fat: propagate umode_t

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2011-07-26 03:21:30 -04:00
parent d0c00d0671
commit dacd0e7b39
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/fat/fat.h
View File

@ -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) static inline int fat_mode_can_hold_ro(struct inode *inode)
{ {
struct msdos_sb_info *sbi = MSDOS_SB(inode->i_sb); struct msdos_sb_info *sbi = MSDOS_SB(inode->i_sb);
mode_t mask; umode_t mask;
if (S_ISDIR(inode->i_mode)) { if (S_ISDIR(inode->i_mode)) {
if (!sbi->options.rodir) 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. */ /* Convert attribute bits and a mask to the UNIX mode. */
static inline mode_t fat_make_mode(struct msdos_sb_info *sbi, static inline umode_t fat_make_mode(struct msdos_sb_info *sbi,
u8 attrs, mode_t mode) u8 attrs, umode_t mode)
{ {
if (attrs & ATTR_RO && !((attrs & ATTR_DIR) && !sbi->options.rodir)) if (attrs & ATTR_RO && !((attrs & ATTR_DIR) && !sbi->options.rodir))
mode &= ~S_IWUGO; mode &= ~S_IWUGO;

4
fs/fat/file.c
View File

@ -314,7 +314,7 @@ EXPORT_SYMBOL_GPL(fat_getattr);
static int fat_sanitize_mode(const struct msdos_sb_info *sbi, static int fat_sanitize_mode(const struct msdos_sb_info *sbi,
struct inode *inode, umode_t *mode_ptr) struct inode *inode, umode_t *mode_ptr)
{ {
mode_t mask, perm; umode_t mask, perm;
/* /*
* Note, the basic check is already done by a caller of * 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,
static int fat_allow_set_time(struct msdos_sb_info *sbi, struct inode *inode) static int fat_allow_set_time(struct msdos_sb_info *sbi, struct inode *inode)
{ {
mode_t allow_utime = sbi->options.allow_utime; umode_t allow_utime = sbi->options.allow_utime;
if (current_fsuid() != inode->i_uid) { if (current_fsuid() != inode->i_uid) {
if (in_group_p(inode->i_gid)) if (in_group_p(inode->i_gid))