diff options
| -rw-r--r-- | xlators/cluster/ec/src/ec-locks.c | 5 | ||||
| -rw-r--r-- | xlators/storage/posix/src/posix-helpers.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/xlators/cluster/ec/src/ec-locks.c b/xlators/cluster/ec/src/ec-locks.c index dd79514359f..9c41e119834 100644 --- a/xlators/cluster/ec/src/ec-locks.c +++ b/xlators/cluster/ec/src/ec-locks.c @@ -77,7 +77,10 @@ int32_t ec_lock_check(ec_fop_data_t *fop, uintptr_t *mask) } } } else { - error = EIO; + if (fop->answer && fop->answer->op_ret < 0) + error = fop->answer->op_errno; + else + error = EIO; } } diff --git a/xlators/storage/posix/src/posix-helpers.c b/xlators/storage/posix/src/posix-helpers.c index e2c5eb2c8ff..cae56e7b590 100644 --- a/xlators/storage/posix/src/posix-helpers.c +++ b/xlators/storage/posix/src/posix-helpers.c @@ -69,6 +69,8 @@ static char* posix_ignore_xattrs[] = { GLUSTERFS_POSIXLK_COUNT, GLUSTERFS_PARENT_ENTRYLK, GF_GFIDLESS_LOOKUP, + GLUSTERFS_INODELK_DOM_COUNT, + GLUSTERFS_INTERNAL_FOP_KEY, NULL }; @@ -1517,6 +1519,7 @@ _handle_entry_create_keyvalue_pair (dict_t *d, char *k, data_t *v, !strcmp ("gfid-req", k) || !strcmp (POSIX_ACL_DEFAULT_XATTR, k) || !strcmp (POSIX_ACL_ACCESS_XATTR, k) || + posix_xattr_ignorable (k) || ZR_FILE_CONTENT_REQUEST(k)) { return 0; } |