summaryrefslogtreecommitdiffstats
path: root/xlators/cluster/ec/src/ec-inode-write.c
diff options
context:
space:
mode:
Diffstat (limited to 'xlators/cluster/ec/src/ec-inode-write.c')
-rw-r--r--xlators/cluster/ec/src/ec-inode-write.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/xlators/cluster/ec/src/ec-inode-write.c b/xlators/cluster/ec/src/ec-inode-write.c
index ffdac632683..b915a992a00 100644
--- a/xlators/cluster/ec/src/ec-inode-write.c
+++ b/xlators/cluster/ec/src/ec-inode-write.c
@@ -68,8 +68,8 @@ out:
return 0;
}
-int32_t
-ec_update_write(ec_fop_data_t *fop, uintptr_t mask, off_t offset, size_t size)
+static int32_t
+ec_update_write(ec_fop_data_t *fop, uintptr_t mask, off_t offset, uint64_t size)
{
struct iobref *iobref = NULL;
struct iobuf *iobuf = NULL;
@@ -219,10 +219,10 @@ ec_manager_xattr(ec_fop_data_t *fop, int32_t state)
if (fop->fd == NULL) {
ec_lock_prepare_inode(fop, &fop->loc[0],
EC_UPDATE_META | EC_QUERY_INFO, 0,
- LLONG_MAX);
+ EC_RANGE_FULL);
} else {
ec_lock_prepare_fd(fop, fop->fd, EC_UPDATE_META | EC_QUERY_INFO,
- 0, LLONG_MAX);
+ 0, EC_RANGE_FULL);
}
ec_lock(fop);
@@ -455,10 +455,10 @@ ec_manager_setattr(ec_fop_data_t *fop, int32_t state)
if (fop->fd == NULL) {
ec_lock_prepare_inode(fop, &fop->loc[0],
EC_UPDATE_META | EC_QUERY_INFO, 0,
- LLONG_MAX);
+ EC_RANGE_FULL);
} else {
ec_lock_prepare_fd(fop, fop->fd, EC_UPDATE_META | EC_QUERY_INFO,
- 0, LLONG_MAX);
+ 0, EC_RANGE_FULL);
}
ec_lock(fop);
@@ -1101,8 +1101,8 @@ ec_update_discard_write(ec_fop_data_t *fop, uintptr_t mask)
ec_t *ec = fop->xl->private;
off_t off_head = 0;
off_t off_tail = 0;
- size_t size_head = 0;
- size_t size_tail = 0;
+ uint64_t size_head = 0;
+ uint64_t size_tail = 0;
int error = 0;
off_head = fop->offset * ec->fragments - fop->int32;
@@ -1172,7 +1172,7 @@ ec_manager_discard(ec_fop_data_t *fop, int32_t state)
{
ec_cbk_data_t *cbk = NULL;
off_t fl_start = 0;
- size_t fl_size = 0;
+ uint64_t fl_size = 0;
switch (state) {
case EC_STATE_INIT:
@@ -1341,7 +1341,7 @@ int32_t
ec_update_truncate_write(ec_fop_data_t *fop, uintptr_t mask)
{
ec_t *ec = fop->xl->private;
- size_t size = fop->offset * ec->fragments - fop->user_size;
+ uint64_t size = fop->offset * ec->fragments - fop->user_size;
return ec_update_write(fop, mask, fop->user_size, size);
}
@@ -1420,12 +1420,12 @@ ec_manager_truncate(ec_fop_data_t *fop, int32_t state)
ec_lock_prepare_inode(
fop, &fop->loc[0],
EC_UPDATE_DATA | EC_UPDATE_META | EC_QUERY_INFO,
- fop->offset, LLONG_MAX);
+ fop->offset, EC_RANGE_FULL);
} else {
ec_lock_prepare_fd(
fop, fop->fd,
EC_UPDATE_DATA | EC_UPDATE_META | EC_QUERY_INFO,
- fop->offset, LLONG_MAX);
+ fop->offset, EC_RANGE_FULL);
}
ec_lock(fop);
@@ -1739,7 +1739,7 @@ ec_writev_merge_tail(call_frame_t *frame, void *cookie, xlator_t *this,
{
ec_t *ec = this->private;
ec_fop_data_t *fop = frame->local;
- size_t size, base, tmp;
+ uint64_t size, base, tmp;
if (op_ret >= 0) {
tmp = 0;
@@ -1772,7 +1772,7 @@ ec_writev_merge_head(call_frame_t *frame, void *cookie, xlator_t *this,
{
ec_t *ec = this->private;
ec_fop_data_t *fop = frame->local;
- size_t size, base;
+ uint64_t size, base;
if (op_ret >= 0) {
size = fop->head;
@@ -1884,7 +1884,7 @@ out:
static void
ec_merge_stripe_head_locked(ec_t *ec, ec_fop_data_t *fop, ec_stripe_t *stripe)
{
- size_t head, size;
+ uint32_t head, size;
head = fop->head;
memcpy(fop->vector[0].iov_base, stripe->data, head);
@@ -1900,7 +1900,7 @@ ec_merge_stripe_head_locked(ec_t *ec, ec_fop_data_t *fop, ec_stripe_t *stripe)
static void
ec_merge_stripe_tail_locked(ec_t *ec, ec_fop_data_t *fop, ec_stripe_t *stripe)
{
- size_t head, tail;
+ uint32_t head, tail;
off_t offset;
offset = fop->user_size + fop->head;
@@ -2117,7 +2117,7 @@ ec_manager_writev(ec_fop_data_t *fop, int32_t state)
ec_fd_t *ctx = NULL;
ec_t *ec = fop->xl->private;
off_t fl_start = 0;
- size_t fl_size = LLONG_MAX;
+ uint64_t fl_size = LONG_MAX;
switch (state) {
case EC_STATE_INIT:
@@ -2163,7 +2163,7 @@ ec_manager_writev(ec_fop_data_t *fop, int32_t state)
cbk = ec_fop_prepare_answer(fop, _gf_false);
if (cbk != NULL) {
ec_t *ec = fop->xl->private;
- size_t size;
+ uint64_t size;
ec_iatt_rebuild(fop->xl->private, cbk->iatt, 2, cbk->count);