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/amigaffs.c | |
parent | a5e7ed3287e45f2eafbcf9e7e6fdc5a0191acf40 (diff) |
affs: propagate umode_t
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/affs/amigaffs.c')
-rw-r--r-- | fs/affs/amigaffs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c index de37ec842340..52a6407682e6 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) | |||
390 | ds->ticks = cpu_to_be32(secs * 50); | 390 | ds->ticks = cpu_to_be32(secs * 50); |
391 | } | 391 | } |
392 | 392 | ||
393 | mode_t | 393 | umode_t |
394 | prot_to_mode(u32 prot) | 394 | prot_to_mode(u32 prot) |
395 | { | 395 | { |
396 | int mode = 0; | 396 | umode_t mode = 0; |
397 | 397 | ||
398 | if (!(prot & FIBF_NOWRITE)) | 398 | if (!(prot & FIBF_NOWRITE)) |
399 | mode |= S_IWUSR; | 399 | mode |= S_IWUSR; |
@@ -421,7 +421,7 @@ void | |||
421 | mode_to_prot(struct inode *inode) | 421 | mode_to_prot(struct inode *inode) |
422 | { | 422 | { |
423 | u32 prot = AFFS_I(inode)->i_protect; | 423 | u32 prot = AFFS_I(inode)->i_protect; |
424 | mode_t mode = inode->i_mode; | 424 | umode_t mode = inode->i_mode; |
425 | 425 | ||
426 | if (!(mode & S_IXUSR)) | 426 | if (!(mode & S_IXUSR)) |
427 | prot |= FIBF_NOEXECUTE; | 427 | prot |= FIBF_NOEXECUTE; |