From: Miklos Szeredi <mszeredi@redhat.com>
Date: Thu, 18 May 2017 14:11:24 +0000 (+0200)
Subject: ovl: don't fail copy-up if upper doesn't support xattr
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6266d465bde044a105f6c2d4e244680f951a2d70;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

ovl: don't fail copy-up if upper doesn't support xattr

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
---

diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c
index 061a8448e6c4..f92ab35d43a6 100644
--- a/fs/overlayfs/copy_up.c
+++ b/fs/overlayfs/copy_up.c
@@ -300,7 +300,11 @@ static int ovl_set_origin(struct dentry *dentry, struct dentry *lower,
 			return PTR_ERR(fh);
 	}
 
-	err = ovl_do_setxattr(upper, OVL_XATTR_ORIGIN, fh, fh ? fh->len : 0, 0);
+	/*
+	 * Do not fail when upper doesn't support xattrs.
+	 */
+	err = ovl_check_setxattr(dentry, upper, OVL_XATTR_ORIGIN, fh,
+				 fh ? fh->len : 0, 0);
 	kfree(fh);
 
 	return err;