android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

affs: 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:04:30 -04:00
parent a5e7ed3287
commit a760b03dc0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/affs/affs.h
View File

@ -136,7 +136,7 @@ extern int affs_remove_header(struct dentry *dentry);
extern u32 affs_checksum_block(struct super_block *sb, struct buffer_head *bh); extern u32 affs_checksum_block(struct super_block *sb, struct buffer_head *bh);
extern void affs_fix_checksum(struct super_block *sb, struct buffer_head *bh); extern void affs_fix_checksum(struct super_block *sb, struct buffer_head *bh);
extern void secs_to_datestamp(time_t secs, struct affs_date *ds); extern void secs_to_datestamp(time_t secs, struct affs_date *ds);
extern mode_t prot_to_mode(u32 prot); extern umode_t prot_to_mode(u32 prot);
extern void mode_to_prot(struct inode *inode); extern void mode_to_prot(struct inode *inode);
extern void affs_error(struct super_block *sb, const char *function, const char *fmt, ...); extern void affs_error(struct super_block *sb, const char *function, const char *fmt, ...);
extern void affs_warning(struct super_block *sb, const char *function, const char *fmt, ...); extern void affs_warning(struct super_block *sb, const char *function, const char *fmt, ...);

6
fs/affs/amigaffs.c
View File

@ -390,10 +390,10 @@ secs_to_datestamp(time_t secs, struct affs_date *ds)
ds->ticks = cpu_to_be32(secs * 50); ds->ticks = cpu_to_be32(secs * 50);
} }
mode_t umode_t
prot_to_mode(u32 prot) prot_to_mode(u32 prot)
{ {
int mode = 0; umode_t mode = 0;
if (!(prot & FIBF_NOWRITE)) if (!(prot & FIBF_NOWRITE))
mode |= S_IWUSR; mode |= S_IWUSR;
@ -421,7 +421,7 @@ void
mode_to_prot(struct inode *inode) mode_to_prot(struct inode *inode)
{ {
u32 prot = AFFS_I(inode)->i_protect; u32 prot = AFFS_I(inode)->i_protect;
mode_t mode = inode->i_mode; umode_t mode = inode->i_mode;
if (!(mode & S_IXUSR)) if (!(mode & S_IXUSR))
prot |= FIBF_NOEXECUTE; prot |= FIBF_NOEXECUTE;