Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security

[cascardo/linux.git] / fs / minix / bitmap.c

diff --git a/fs/minix/bitmap.c b/fs/minix/bitmap.c
index ef175cb..4bc50da 100644 (file)
--- a/fs/minix/bitmap.c
+++ b/fs/minix/bitmap.c
@@ -209,7 +209,7 @@ void minix_free_inode(struct inode * inode)
        mark_buffer_dirty(bh);
 }
 
-struct inode *minix_new_inode(const struct inode *dir, int mode, int *error)
+struct inode *minix_new_inode(const struct inode *dir, umode_t mode, int *error)
 {
        struct super_block *sb = dir->i_sb;
        struct minix_sb_info *sbi = minix_sb(sb);