|
 |
f338ef |
From 4c2aa7adef3df500043dd45614d20c9987e6c0d9 Mon Sep 17 00:00:00 2001
|
|
|
f338ef |
From: Pranith Kumar K <pkarampu@redhat.com>
|
|
|
f338ef |
Date: Fri, 2 Aug 2019 12:05:09 +0530
|
|
|
f338ef |
Subject: [PATCH 274/276] cluster/ec: Update lock->good_mask on parent fop
|
|
|
f338ef |
failure
|
|
|
f338ef |
|
|
|
f338ef |
When discard/truncate performs write fop, it should do so
|
|
|
f338ef |
after updating lock->good_mask to make sure readv happens
|
|
|
f338ef |
on the correct mask
|
|
|
f338ef |
|
|
|
f338ef |
Upstream-patch: https://review.gluster.org/c/glusterfs/+/23147
|
|
|
f338ef |
fixes: bz#1730914
|
|
|
f338ef |
Change-Id: Idfef0bbcca8860d53707094722e6ba3f81c583b7
|
|
|
f338ef |
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
|
|
|
f338ef |
Reviewed-on: https://code.engineering.redhat.com/gerrit/177978
|
|
|
f338ef |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
f338ef |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
f338ef |
---
|
|
|
f338ef |
xlators/cluster/ec/src/ec-common.h | 2 ++
|
|
|
f338ef |
xlators/cluster/ec/src/ec-inode-write.c | 2 ++
|
|
|
f338ef |
2 files changed, 4 insertions(+)
|
|
|
f338ef |
|
|
|
f338ef |
diff --git a/xlators/cluster/ec/src/ec-common.h b/xlators/cluster/ec/src/ec-common.h
|
|
|
f338ef |
index e948342..3c69471 100644
|
|
|
f338ef |
--- a/xlators/cluster/ec/src/ec-common.h
|
|
|
f338ef |
+++ b/xlators/cluster/ec/src/ec-common.h
|
|
|
f338ef |
@@ -204,4 +204,6 @@ void
|
|
|
f338ef |
ec_reset_entry_healing(ec_fop_data_t *fop);
|
|
|
f338ef |
char *
|
|
|
f338ef |
ec_msg_str(ec_fop_data_t *fop);
|
|
|
f338ef |
+void
|
|
|
f338ef |
+ec_lock_update_good(ec_lock_t *lock, ec_fop_data_t *fop);
|
|
|
f338ef |
#endif /* __EC_COMMON_H__ */
|
|
|
f338ef |
diff --git a/xlators/cluster/ec/src/ec-inode-write.c b/xlators/cluster/ec/src/ec-inode-write.c
|
|
|
f338ef |
index 2f28e11..8bfa3b4 100644
|
|
|
f338ef |
--- a/xlators/cluster/ec/src/ec-inode-write.c
|
|
|
f338ef |
+++ b/xlators/cluster/ec/src/ec-inode-write.c
|
|
|
f338ef |
@@ -89,6 +89,8 @@ ec_update_write(ec_fop_data_t *fop, uintptr_t mask, off_t offset, uint64_t size)
|
|
|
f338ef |
goto out;
|
|
|
f338ef |
}
|
|
|
f338ef |
|
|
|
f338ef |
+ if (fop->locks[0].lock)
|
|
|
f338ef |
+ ec_lock_update_good(fop->locks[0].lock, fop);
|
|
|
f338ef |
vector.iov_base = iobuf->ptr;
|
|
|
f338ef |
vector.iov_len = size;
|
|
|
f338ef |
memset(vector.iov_base, 0, vector.iov_len);
|
|
|
f338ef |
--
|
|
|
f338ef |
1.8.3.1
|
|
|
f338ef |
|