Merge branch 'for-3.14/drivers' of git://git.kernel.dk/linux-block

[firefly-linux-kernel-4.4.55.git] / fs / 9p / acl.c

diff --git a/fs/9p/acl.c b/fs/9p/acl.c
index 7af425f53beef91a6d21dc86b76e161ff7ed1696..8482f2d1160667ba1255ee5b48434287bc51da65 100644 (file)
--- a/fs/9p/acl.c
+++ b/fs/9p/acl.c
@@ -156,7 +156,7 @@ int v9fs_acl_chmod(struct inode *inode, struct p9_fid *fid)
                return -EOPNOTSUPP;
        acl = v9fs_get_cached_acl(inode, ACL_TYPE_ACCESS);
        if (acl) {
-               retval = posix_acl_chmod(&acl, GFP_KERNEL, inode->i_mode);
+               retval = __posix_acl_chmod(&acl, GFP_KERNEL, inode->i_mode);
                if (retval)
                        return retval;
                set_cached_acl(inode, ACL_TYPE_ACCESS, acl);
@@ -200,7 +200,7 @@ int v9fs_acl_mode(struct inode *dir, umode_t *modep,
        if (acl) {
                if (S_ISDIR(mode))
                        *dpacl = posix_acl_dup(acl);
-               retval = posix_acl_create(&acl, GFP_NOFS, &mode);
+               retval = __posix_acl_create(&acl, GFP_NOFS, &mode);
                if (retval < 0)
                        return retval;
                if (retval > 0)