libfrog: convert ptvar.c functions to negative error codes
Convert libfrog functions to return negative error codes like libxfs
does.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
diff --git a/libfrog/ptvar.c b/libfrog/ptvar.c
index f375df3..7ac8c54 100644
--- a/libfrog/ptvar.c
+++ b/libfrog/ptvar.c
@@ -54,15 +54,15 @@
ptv = malloc(PTVAR_SIZE(nr, size));
if (!ptv)
- return errno;
+ return -errno;
ptv->data_size = size;
ptv->nr_counters = nr;
ptv->nr_used = 0;
memset(ptv->data, 0, nr * size);
- ret = pthread_mutex_init(&ptv->lock, NULL);
+ ret = -pthread_mutex_init(&ptv->lock, NULL);
if (ret)
goto out;
- ret = pthread_key_create(&ptv->key, NULL);
+ ret = -pthread_key_create(&ptv->key, NULL);
if (ret)
goto out_mutex;
@@ -99,7 +99,7 @@
pthread_mutex_lock(&ptv->lock);
assert(ptv->nr_used < ptv->nr_counters);
p = &ptv->data[(ptv->nr_used++) * ptv->data_size];
- ret = pthread_setspecific(ptv->key, p);
+ ret = -pthread_setspecific(ptv->key, p);
if (ret)
goto out_unlock;
pthread_mutex_unlock(&ptv->lock);
diff --git a/scrub/counter.c b/scrub/counter.c
index 1bb726d..6d91eb6 100644
--- a/scrub/counter.c
+++ b/scrub/counter.c
@@ -38,7 +38,7 @@
p = malloc(sizeof(struct ptcounter));
if (!p)
return errno;
- ret = ptvar_alloc(nr, sizeof(uint64_t), &p->var);
+ ret = -ptvar_alloc(nr, sizeof(uint64_t), &p->var);
if (ret) {
free(p);
return ret;
@@ -67,7 +67,7 @@
p = ptvar_get(ptc->var, &ret);
if (ret)
- return ret;
+ return -ret;
*p += nr;
return 0;
}
@@ -92,5 +92,5 @@
uint64_t *sum)
{
*sum = 0;
- return ptvar_foreach(ptc->var, ptcounter_val_helper, sum);
+ return -ptvar_foreach(ptc->var, ptcounter_val_helper, sum);
}
diff --git a/scrub/descr.c b/scrub/descr.c
index 7f65a4e..a863c06 100644
--- a/scrub/descr.c
+++ b/scrub/descr.c
@@ -89,7 +89,7 @@
int ret;
assert(descr_ptvar == NULL);
- ret = ptvar_alloc(nr_threads, DESCR_BUFSZ, &descr_ptvar);
+ ret = -ptvar_alloc(nr_threads, DESCR_BUFSZ, &descr_ptvar);
if (ret)
str_liberror(ctx, ret, _("creating description buffer"));
diff --git a/scrub/phase7.c b/scrub/phase7.c
index 191f2e4..75cf088 100644
--- a/scrub/phase7.c
+++ b/scrub/phase7.c
@@ -39,8 +39,8 @@
counts = ptvar_get((struct ptvar *)arg, &ret);
if (ret) {
- str_liberror(ctx, ret, _("retrieving summary counts"));
- return ret;
+ str_liberror(ctx, -ret, _("retrieving summary counts"));
+ return -ret;
}
if (fsmap->fmr_device == ctx->fsinfo.fs_logdev)
return 0;
@@ -134,7 +134,7 @@
return error;
}
- error = ptvar_alloc(scrub_nproc(ctx), sizeof(struct summary_counts),
+ error = -ptvar_alloc(scrub_nproc(ctx), sizeof(struct summary_counts),
&ptvar);
if (error) {
str_liberror(ctx, error, _("setting up block counter"));
@@ -145,7 +145,7 @@
error = scrub_scan_all_spacemaps(ctx, count_block_summary, ptvar);
if (error)
goto out_free;
- error = ptvar_foreach(ptvar, add_summaries, &totalcount);
+ error = -ptvar_foreach(ptvar, add_summaries, &totalcount);
if (error) {
str_liberror(ctx, error, _("counting blocks"));
goto out_free;
diff --git a/scrub/read_verify.c b/scrub/read_verify.c
index 82605c8..bfee3a6 100644
--- a/scrub/read_verify.c
+++ b/scrub/read_verify.c
@@ -119,7 +119,7 @@
rvp->ctx = ctx;
rvp->disk = disk;
rvp->ioerr_fn = ioerr_fn;
- ret = ptvar_alloc(submitter_threads, sizeof(struct read_verify),
+ ret = -ptvar_alloc(submitter_threads, sizeof(struct read_verify),
&rvp->rvstate);
if (ret)
goto out_counter;
@@ -338,7 +338,7 @@
rv = ptvar_get(rvp->rvstate, &ret);
if (ret)
- return ret;
+ return -ret;
req_end = start + length;
rv_end = rv->io_start + rv->io_length;
@@ -386,7 +386,7 @@
if (rv->io_length == 0)
return 0;
- return read_verify_queue(rvp, rv);
+ return -read_verify_queue(rvp, rv);
}
/* Force any stashed IOs into the verifier. */
@@ -396,7 +396,7 @@
{
assert(rvp->readbuf);
- return ptvar_foreach(rvp->rvstate, force_one_io, rvp);
+ return -ptvar_foreach(rvp->rvstate, force_one_io, rvp);
}
/* How many bytes has this process verified? */
