jffs2: use generic posix ACL infrastructure

[~andy/linux] / fs / jffs2 / fs.c

diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c
index 09b3ed45572475feb68b117fcf5b420a1a5e4d8f..a69e426435ddc3d2d207701df7a5b06264c1c481 100644 (file)
--- a/fs/jffs2/fs.c
+++ b/fs/jffs2/fs.c
@@ -190,15 +190,16 @@ int jffs2_do_setattr (struct inode *inode, struct iattr *iattr)
 
 int jffs2_setattr(struct dentry *dentry, struct iattr *iattr)
 {
+       struct inode *inode = dentry->d_inode;
        int rc;
 
-       rc = inode_change_ok(dentry->d_inode, iattr);
+       rc = inode_change_ok(inode, iattr);
        if (rc)
                return rc;
 
-       rc = jffs2_do_setattr(dentry->d_inode, iattr);
+       rc = jffs2_do_setattr(inode, iattr);
        if (!rc && (iattr->ia_valid & ATTR_MODE))
-               rc = jffs2_acl_chmod(dentry->d_inode);
+               rc = posix_acl_chmod(inode, inode->i_mode);
 
        return rc;
 }