Merge branch 'for-linus-3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-beck.git] / fs / xfs / xfs_xattr.c

diff --git a/fs/xfs/xfs_xattr.c b/fs/xfs/xfs_xattr.c
index b1850e1489ef6e2c17b8bc3eef905cfc741178c1..839b35ca21c69320c736ac636ef681b1362402ce 100644 (file)
--- a/fs/xfs/xfs_xattr.c
+++ b/fs/xfs/xfs_xattr.c
@@ -54,12 +54,35 @@ xfs_xattr_get(const struct xattr_handler *handler, struct dentry *dentry,
        return asize;
 }
 
+void
+xfs_forget_acl(
+       struct inode            *inode,
+       const char              *name,
+       int                     xflags)
+{
+       /*
+        * Invalidate any cached ACLs if the user has bypassed the ACL
+        * interface. We don't validate the content whatsoever so it is caller
+        * responsibility to provide data in valid format and ensure i_mode is
+        * consistent.
+        */
+       if (xflags & ATTR_ROOT) {
+#ifdef CONFIG_XFS_POSIX_ACL
+               if (!strcmp(name, SGI_ACL_FILE))
+                       forget_cached_acl(inode, ACL_TYPE_ACCESS);
+               else if (!strcmp(name, SGI_ACL_DEFAULT))
+                       forget_cached_acl(inode, ACL_TYPE_DEFAULT);
+#endif
+       }
+}
+
 static int
 xfs_xattr_set(const struct xattr_handler *handler, struct dentry *dentry,
                const char *name, const void *value, size_t size, int flags)
 {
-       int xflags = handler->flags;
-       struct xfs_inode *ip = XFS_I(d_inode(dentry));
+       int                     xflags = handler->flags;
+       struct xfs_inode        *ip = XFS_I(d_inode(dentry));
+       int                     error;
 
        if (strcmp(name, "") == 0)
                return -EINVAL;
@@ -72,8 +95,12 @@ xfs_xattr_set(const struct xattr_handler *handler, struct dentry *dentry,
 
        if (!value)
                return xfs_attr_remove(ip, (unsigned char *)name, xflags);
-       return xfs_attr_set(ip, (unsigned char *)name,
+       error = xfs_attr_set(ip, (unsigned char *)name,
                                (void *)value, size, xflags);
+       if (!error)
+               xfs_forget_acl(d_inode(dentry), name, xflags);
+
+       return error;
 }
 
 static const struct xattr_handler xfs_xattr_user_handler = {