diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-26 03:04:30 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-03 22:55:04 -0500 |
| commit | a760b03dc0ac4c9663577ca45de5e0fe1c35dc13 (patch) | |
| tree | 47509c0fb246117a3e020a7ce700751ef8cad2cb /fs/affs | |
| parent | a5e7ed3287e45f2eafbcf9e7e6fdc5a0191acf40 (diff) | |
| download | linux-3.10-a760b03dc0ac4c9663577ca45de5e0fe1c35dc13.tar.gz linux-3.10-a760b03dc0ac4c9663577ca45de5e0fe1c35dc13.tar.bz2 linux-3.10-a760b03dc0ac4c9663577ca45de5e0fe1c35dc13.zip | |
affs: propagate umode_t
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/affs')
| -rw-r--r-- | fs/affs/affs.h | 2 | ||||
| -rw-r--r-- | fs/affs/amigaffs.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/affs/affs.h b/fs/affs/affs.h index 9cad9b4a9af..45a0ce45d7b 100644 --- a/fs/affs/affs.h +++ b/fs/affs/affs.h @@ -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 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 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 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, ...); diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c index de37ec84234..52a6407682e 100644 --- a/fs/affs/amigaffs.c +++ b/fs/affs/amigaffs.c @@ -390,10 +390,10 @@ secs_to_datestamp(time_t secs, struct affs_date *ds) ds->ticks = cpu_to_be32(secs * 50); } -mode_t +umode_t prot_to_mode(u32 prot) { - int mode = 0; + umode_t mode = 0; if (!(prot & FIBF_NOWRITE)) mode |= S_IWUSR; @@ -421,7 +421,7 @@ void mode_to_prot(struct inode *inode) { u32 prot = AFFS_I(inode)->i_protect; - mode_t mode = inode->i_mode; + umode_t mode = inode->i_mode; if (!(mode & S_IXUSR)) prot |= FIBF_NOEXECUTE; |