Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / fs / jfs / acl.c

diff --git a/fs/jfs/acl.c b/fs/jfs/acl.c
index 958cdfb..8353f48 100644 (file)
--- a/fs/jfs/acl.c
+++ b/fs/jfs/acl.c
@@ -281,9 +281,9 @@ int jfs_setattr(struct dentry *dentry, struct iattr *iattr)
        if (rc)
                return rc;
 
-       inode_setattr(inode, iattr);
+       rc = inode_setattr(inode, iattr);
 
-       if (iattr->ia_valid & ATTR_MODE)
+       if (!rc && (iattr->ia_valid & ATTR_MODE))
                rc = jfs_acl_chmod(inode);
 
        return rc;