From 9013328774c87d8a32ff80e78f6478e22c5157b9 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#1805056 Change-Id: Idfef0bbcca8860d53707094722e6ba3f81c583b7 Signed-off-by: Pranith Kumar K --- xlators/cluster/ec/src/ec-common.h | 2 ++ xlators/cluster/ec/src/ec-inode-write.c | 2 ++ 2 files changed, 4 insertions(+) (limited to 'xlators') diff --git a/xlators/cluster/ec/src/ec-common.h b/xlators/cluster/ec/src/ec-common.h index 6d5530c15a6..af534cdfe96 100644 --- a/xlators/cluster/ec/src/ec-common.h +++ b/xlators/cluster/ec/src/ec-common.h @@ -193,4 +193,6 @@ ec_lock_unlocked(call_frame_t *frame, void *cookie, xlator_t *this, void ec_update_fd_status(fd_t *fd, xlator_t *xl, int child_index, int32_t ret_status); +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 d0c5221bf09..5d520d35bdd 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, size_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