ceph: Fix up after semantic merge conflict

[~andy/linux] / fs / ceph / inode.c

diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index 6fc10a7d7c5926d9a5d22f4921c14ad8c2e7a1a3..8b8b506636ccce45fa38ab8bca6758d2b3d6ef82 100644 (file)
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -9,6 +9,7 @@
 #include <linux/namei.h>
 #include <linux/writeback.h>
 #include <linux/vmalloc.h>
+#include <linux/posix_acl.h>
 
 #include "super.h"
 #include "mds_client.h"
@@ -1805,7 +1806,7 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr)
                __mark_inode_dirty(inode, inode_dirty_flags);
 
        if (ia_valid & ATTR_MODE) {
-               err = ceph_acl_chmod(dentry, inode);
+               err = posix_acl_chmod(inode, attr->ia_mode);
                if (err)
                        goto out_put;
        }