Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[mirror_ubuntu-artful-kernel.git] / fs / affs / affs.h

diff --git a/fs/affs/affs.h b/fs/affs/affs.h
index c2b9c79eb64e0ef0fa4f64332761d34fb8973602..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, ...);
@@ -156,8 +156,8 @@ extern void affs_free_bitmap(struct super_block *sb);
 extern int     affs_hash_name(struct super_block *sb, const u8 *name, unsigned int len);
 extern struct dentry *affs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *);
 extern int     affs_unlink(struct inode *dir, struct dentry *dentry);
-extern int     affs_create(struct inode *dir, struct dentry *dentry, int mode, struct nameidata *);
-extern int     affs_mkdir(struct inode *dir, struct dentry *dentry, int mode);
+extern int     affs_create(struct inode *dir, struct dentry *dentry, umode_t mode, struct nameidata *);
+extern int     affs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode);
 extern int     affs_rmdir(struct inode *dir, struct dentry *dentry);
 extern int     affs_link(struct dentry *olddentry, struct inode *dir,
                          struct dentry *dentry);