affs: propagate umode_t

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/affs/affs.h b/fs/affs/affs.h
index 9cad9b4a9af77159b529987e57298a4cfc25665a..45a0ce45d7b46afa94b1290511bc1f91a9872137 100644 (file)
--- 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 de37ec842340c3943de5c7351a1e70cc7c5e4268..52a6407682e65e1aa0c82805c2d052cc09b20361 100644 (file)
--- 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;