Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

[cascardo/linux.git] / fs / f2fs / acl.c

diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c
index 137af42..44abc2f 100644 (file)
--- a/fs/f2fs/acl.c
+++ b/fs/f2fs/acl.c
@@ -299,7 +299,7 @@ int f2fs_acl_chmod(struct inode *inode)
        struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
        struct posix_acl *acl;
        int error;
-       mode_t mode = get_inode_mode(inode);
+       umode_t mode = get_inode_mode(inode);
 
        if (!test_opt(sbi, POSIX_ACL))
                return 0;