diff options
| -rw-r--r-- | xlators/cluster/ec/src/ec-common.c | 4 | ||||
| -rw-r--r-- | xlators/cluster/ec/src/ec-inode-write.c | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/xlators/cluster/ec/src/ec-common.c b/xlators/cluster/ec/src/ec-common.c index bd657428d21..84f0d936faa 100644 --- a/xlators/cluster/ec/src/ec-common.c +++ b/xlators/cluster/ec/src/ec-common.c @@ -101,6 +101,7 @@ ec_fix_open(ec_fop_data_t *fop, uintptr_t mask) { uintptr_t need_open = 0; int ret = 0; + int32_t flags = 0; loc_t loc = { 0, }; @@ -121,6 +122,7 @@ ec_fix_open(ec_fop_data_t *fop, uintptr_t mask) goto out; } + flags = fop->fd->flags & (~(O_TRUNC | O_APPEND | O_CREAT | O_EXCL)); if (IA_IFDIR == fop->fd->inode->ia_type) { ec_opendir(fop->frame, fop->xl, need_open, EC_MINIMUM_ONE | EC_FOP_NO_PROPAGATE_ERROR, NULL, NULL, @@ -128,7 +130,7 @@ ec_fix_open(ec_fop_data_t *fop, uintptr_t mask) } else { ec_open(fop->frame, fop->xl, need_open, EC_MINIMUM_ONE | EC_FOP_NO_PROPAGATE_ERROR, NULL, NULL, &loc, - fop->fd->flags & (~O_TRUNC), fop->fd, NULL); + flags, fop->fd, NULL); } out: diff --git a/xlators/cluster/ec/src/ec-inode-write.c b/xlators/cluster/ec/src/ec-inode-write.c index b4f20a68538..d0c5221bf09 100644 --- a/xlators/cluster/ec/src/ec-inode-write.c +++ b/xlators/cluster/ec/src/ec-inode-write.c @@ -1985,10 +1985,13 @@ ec_get_lock_good_mask(inode_t *inode, xlator_t *xl) LOCK(&inode->lock); { ictx = __ec_inode_get(inode, xl); - lock = ictx->inode_lock; + if (ictx) + lock = ictx->inode_lock; } UNLOCK(&inode->lock); - return lock->good_mask; + if (lock) + return lock->good_mask; + return 0; } void |