Merge branches 'sh/pm-runtime' and 'common/clkfwk' into sh-fixes-for-linus

[karo-tx-linux.git] / fs / nfs / nfs3acl.c

diff --git a/fs/nfs/nfs3acl.c b/fs/nfs/nfs3acl.c
index e49e73107e6290dda0f9bfa5d625edf5fc54ec2b..7ef23979896dd2cffdbc43aa8b0a5a9e3aaecb09 100644 (file)
--- a/fs/nfs/nfs3acl.c
+++ b/fs/nfs/nfs3acl.c
@@ -415,7 +415,7 @@ fail:
 }
 
 int nfs3_proc_set_default_acl(struct inode *dir, struct inode *inode,
-               mode_t mode)
+               umode_t mode)
 {
        struct posix_acl *dfacl, *acl;
        int error = 0;