From ee0a3e8ae08b7b72598cb797d023046b9f95ab81 Mon Sep 17 00:00:00 2001 From: Minh Diep Date: Thu, 30 Aug 2012 21:33:54 -0700 Subject: [PATCH] LU-1747 osd-zfs: Return zero when deleting nonexistent EAS sanity 103 with ZFS targets fails: [22] $ strace -o /tmp/tmo.strace cp -rp h i -- failed ~ ? cp: preserving permissions for `i/x': No such file or directory ~ ? cp: preserving permissions for `i': No such file or directory The ENOENTs came from osd-zfs's osd_xattr_del(), when MDD tried to delete "system.posix_acl_access". Test-Parameters: envdefinitions=USE_OFD=yes,LOAD_MODULES_REMOTE=true Signed-off-by: Minh Diep Change-Id: I3736b1a89bec3174f7e0a6a848870adfa248d186 Reviewed-on: http://review.whamcloud.com/3833 Reviewed-by: Andreas Dilger Reviewed-by: Li Wei Tested-by: Hudson Tested-by: Maloo --- lustre/osd-zfs/osd_xattr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lustre/osd-zfs/osd_xattr.c b/lustre/osd-zfs/osd_xattr.c index c7ea065..614067c 100644 --- a/lustre/osd-zfs/osd_xattr.c +++ b/lustre/osd-zfs/osd_xattr.c @@ -666,7 +666,7 @@ int __osd_xattr_del(const struct lu_env *env, struct osd_object *obj, return rc; if (obj->oo_xattr == ZFS_NO_OBJECT) - return rc; + return 0; rc = -zap_lookup(uos->os, obj->oo_xattr, name, sizeof(uint64_t), 1, &xa_data_obj); -- 1.8.3.1