From cbb42d0ac88ea7ba49f1fcc85fadb51f5950ab63 Mon Sep 17 00:00:00 2001 From: Li Dongyang Date: Tue, 21 Jul 2015 15:20:49 +1000 Subject: [PATCH] LU-6886 mdd: declare changelog store for POSIX ACLs mdd_xattr_del() records POSIX ACL ops in the changelog, we should declare them in mdd_declare_xattr_del(). Signed-off-by: Li Dongyang Change-Id: I9184c7906d0da715c12b833bab080c56a1a07285 Reviewed-on: http://review.whamcloud.com/15660 Reviewed-by: Fan Yong Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger --- lustre/mdd/mdd_object.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lustre/mdd/mdd_object.c b/lustre/mdd/mdd_object.c index e283a64..03043f2 100644 --- a/lustre/mdd/mdd_object.c +++ b/lustre/mdd/mdd_object.c @@ -1106,9 +1106,13 @@ static int mdd_declare_xattr_del(const struct lu_env *env, if (rc) return rc; - /* Only record user xattr changes */ - if ((strncmp(XATTR_USER_PREFIX, name, - sizeof(XATTR_USER_PREFIX) - 1) == 0)) + /* Only record system & user xattr changes */ + if (strncmp(XATTR_USER_PREFIX, name, + sizeof(XATTR_USER_PREFIX) - 1) == 0 || + strncmp(POSIX_ACL_XATTR_ACCESS, name, + sizeof(POSIX_ACL_XATTR_ACCESS) - 1) == 0 || + strncmp(POSIX_ACL_XATTR_DEFAULT, name, + sizeof(POSIX_ACL_XATTR_DEFAULT) - 1) == 0) rc = mdd_declare_changelog_store(env, mdd, NULL, NULL, handle); return rc; -- 1.8.3.1