ovl: Switch to generic_removexattr

[mirror_ubuntu-zesty-kernel.git] / fs / overlayfs / copy_up.c

diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c
index 80aa6f1eb336996e15c964d72a3d5d05cdc19b46..43fdc2765aea65b85a20b0f28b844a3ba1b40d4e 100644 (file)
--- a/fs/overlayfs/copy_up.c
+++ b/fs/overlayfs/copy_up.c
@@ -80,6 +80,8 @@ int ovl_copy_xattr(struct dentry *old, struct dentry *new)
        }
 
        for (name = buf; name < (buf + list_size); name += strlen(name) + 1) {
+               if (ovl_is_private_xattr(name))
+                       continue;
 retry:
                size = vfs_getxattr(old, name, value, value_size);
                if (size == -ERANGE)
@@ -292,6 +294,7 @@ static int ovl_copy_up_locked(struct dentry *workdir, struct dentry *upperdir,
                goto out_cleanup;
 
        ovl_dentry_update(dentry, newdentry);
+       ovl_inode_update(d_inode(dentry), d_inode(newdentry));
        newdentry = NULL;
 
        /*