From b100f7f4dca1971cfdbfb88e0b922bb5885cc7d6 Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Fri, 2 Aug 2019 12:05:09 +0530 Subject: cluster/ec: Update lock->good_mask on parent fop failure When discard/truncate performs write fop, it should do so after updating lock->good_mask to make sure readv happens on the correct mask fixes: bz#1739449 Change-Id: Idfef0bbcca8860d53707094722e6ba3f81c583b7 Signed-off-by: Pranith Kumar K --- xlators/cluster/ec/src/ec-common.h | 4 ++++ xlators/cluster/ec/src/ec-inode-write.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/xlators/cluster/ec/src/ec-common.h b/xlators/cluster/ec/src/ec-common.h index e94834219b9..b3bf11d5615 100644 --- a/xlators/cluster/ec/src/ec-common.h +++ b/xlators/cluster/ec/src/ec-common.h @@ -204,4 +204,8 @@ void ec_reset_entry_healing(ec_fop_data_t *fop); char * ec_msg_str(ec_fop_data_t *fop); +gf_boolean_t +__ec_is_last_fop(ec_t *ec); +void +ec_lock_update_good(ec_lock_t *lock, ec_fop_data_t *fop); #endif /* __EC_COMMON_H__ */ diff --git a/xlators/cluster/ec/src/ec-inode-write.c b/xlators/cluster/ec/src/ec-inode-write.c index 2f28e11637c..8bfa3b4d08c 100644 --- a/xlators/cluster/ec/src/ec-inode-write.c +++ b/xlators/cluster/ec/src/ec-inode-write.c @@ -89,6 +89,8 @@ ec_update_write(ec_fop_data_t *fop, uintptr_t mask, off_t offset, uint64_t size) goto out; } + if (fop->locks[0].lock) + ec_lock_update_good(fop->locks[0].lock, fop); vector.iov_base = iobuf->ptr; vector.iov_len = size; memset(vector.iov_base, 0, vector.iov_len); -- cgit