Merge commit 'v3.1-rc2' into HEAD

[~andy/linux] / fs / 9p / acl.c

diff --git a/fs/9p/acl.c b/fs/9p/acl.c
index 814be079c185277e5fde8f186cd1d2611e32e73d..9a1d426307510135444da722883e570fe52410b9 100644 (file)
--- a/fs/9p/acl.c
+++ b/fs/9p/acl.c
@@ -98,7 +98,6 @@ static struct posix_acl *v9fs_get_cached_acl(struct inode *inode, int type)
 
 struct posix_acl *v9fs_iop_get_acl(struct inode *inode, int type)
 {
-       struct posix_acl *acl;
        struct v9fs_session_info *v9ses;
 
        v9ses = v9fs_inode2v9ses(inode);
@@ -183,11 +182,11 @@ int v9fs_set_create_acl(struct dentry *dentry,
        return 0;
 }
 
-int v9fs_acl_mode(struct inode *dir, mode_t *modep,
+int v9fs_acl_mode(struct inode *dir, umode_t *modep,
                  struct posix_acl **dpacl, struct posix_acl **pacl)
 {
        int retval = 0;
-       mode_t mode = *modep;
+       umode_t mode = *modep;
        struct posix_acl *acl = NULL;
 
        if (!S_ISLNK(mode)) {
@@ -320,7 +319,7 @@ static int v9fs_xattr_set_acl(struct dentry *dentry, const char *name,
        case ACL_TYPE_ACCESS:
                name = POSIX_ACL_XATTR_ACCESS;
                if (acl) {
-                       mode_t mode = inode->i_mode;
+                       umode_t mode = inode->i_mode;
                        retval = posix_acl_equiv_mode(acl, &mode);
                        if (retval < 0)
                                goto err_out;