On 9/25/19 4:32 PM, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
>
> Convert all programs to use the v5 inumbers ioctl.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> ---
> io/imap.c | 26 +++++-----
> io/open.c | 34 ++++++++-----
> libfrog/bulkstat.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++------
> libfrog/bulkstat.h | 10 +++-
> scrub/fscounters.c | 21 +++++---
> scrub/inodes.c | 46 ++++++++++--------
> 6 files changed, 198 insertions(+), 71 deletions(-)
...
> diff --git a/io/open.c b/io/open.c
> index e0e7fb3e..3c6113a1 100644
> --- a/io/open.c
> +++ b/io/open.c
> @@ -681,39 +681,47 @@ static __u64
> get_last_inode(void)
> {
> struct xfs_fd xfd = XFS_FD_INIT(file->fd);
> - uint64_t lastip = 0;
> + struct xfs_inumbers_req *ireq;
> uint32_t lastgrp = 0;
> - uint32_t ocount = 0;
> - __u64 last_ino;
> - struct xfs_inogrp igroup[IGROUP_NR];
> + __u64 last_ino = 0;
> +
> + ireq = xfrog_inumbers_alloc_req(IGROUP_NR, 0);
> + if (!ireq) {
> + perror("alloc req");
> + return 0;
> + }
>
> for (;;) {
> int ret;
>
> - ret = xfrog_inumbers(&xfd, &lastip, IGROUP_NR, igroup,
> - &ocount);
> + ret = xfrog_inumbers(&xfd, ireq);
> if (ret) {
> errno = ret;
> perror("XFS_IOC_FSINUMBERS");
> - return 0;
> + free(ireq);
no need to free here
> + goto out;
> }
>
> /* Did we reach the last inode? */
> - if (ocount == 0)
> + if (ireq->hdr.ocount == 0)
> break;
>
> /* last inode in igroup table */
> - lastgrp = ocount;
> + lastgrp = ireq->hdr.ocount;
> }
>
> - if (lastgrp == 0)
> - return 0;
> + if (lastgrp == 0) {
> + free(ireq);
or here
> + goto out;
> + }
>
> lastgrp--;
>
> /* The last inode number in use */
> - last_ino = igroup[lastgrp].xi_startino +
> - libxfs_highbit64(igroup[lastgrp].xi_allocmask);
> + last_ino = ireq->inumbers[lastgrp].xi_startino +
> + libxfs_highbit64(ireq->inumbers[lastgrp].xi_allocmask);
> +out:
> + free(ireq);
since you do it here
>
> return last_ino;
> }
> diff --git a/libfrog/bulkstat.c b/libfrog/bulkstat.c
> index 300963f1..85594e5e 100644
> --- a/libfrog/bulkstat.c
> +++ b/libfrog/bulkstat.c
> @@ -435,6 +435,86 @@ xfrog_bulkstat_alloc_req(
> return breq;
> }
>
> +/* Convert a inumbers data from v5 format to v1 format. */
> +void
> +xfrog_inumbers_v5_to_v1(
> + struct xfs_inogrp *ig1,
> + const struct xfs_inumbers *ig5)
> +{
> + ig1->xi_startino = ig5->xi_startino;
> + ig1->xi_alloccount = ig5->xi_alloccount;
> + ig1->xi_allocmask = ig5->xi_allocmask;
> +}
nobody uses this?
...
> diff --git a/scrub/inodes.c b/scrub/inodes.c
> index 2112c9d1..964647ce 100644
> --- a/scrub/inodes.c
> +++ b/scrub/inodes.c
> @@ -49,7 +49,7 @@
> static void
> xfs_iterate_inodes_range_check(
> struct scrub_ctx *ctx,
> - struct xfs_inogrp *inogrp,
> + struct xfs_inumbers *inumbers,
> struct xfs_bulkstat *bstat)
> {
> struct xfs_bulkstat *bs;
> @@ -57,19 +57,19 @@ xfs_iterate_inodes_range_check(
> int error;
>
> for (i = 0, bs = bstat; i < XFS_INODES_PER_CHUNK; i++) {
> - if (!(inogrp->xi_allocmask & (1ULL << i)))
> + if (!(inumbers->xi_allocmask & (1ULL << i)))
> continue;
> - if (bs->bs_ino == inogrp->xi_startino + i) {
> + if (bs->bs_ino == inumbers->xi_startino + i) {
> bs++;
> continue;
> }
>
> /* Load the one inode. */
> error = xfrog_bulkstat_single(&ctx->mnt,
> - inogrp->xi_startino + i, 0, bs);
> - if (error || bs->bs_ino != inogrp->xi_startino + i) {
> + inumbers->xi_startino + i, 0, bs);
> + if (error || bs->bs_ino != inumbers->xi_startino + i) {
> memset(bs, 0, sizeof(struct xfs_bulkstat));
> - bs->bs_ino = inogrp->xi_startino + i;
> + bs->bs_ino = inumbers->xi_startino + i;
> bs->bs_blksize = ctx->mnt_sv.f_frsize;
> }
> bs++;
> @@ -92,12 +92,11 @@ xfs_iterate_inodes_range(
> void *arg)
> {
> struct xfs_handle handle;
> - struct xfs_inogrp inogrp;
> + struct xfs_inumbers_req *ireq;
> struct xfs_bulkstat_req *breq;
> char idescr[DESCR_BUFSZ];
> struct xfs_bulkstat *bs;
> - uint64_t igrp_ino;
> - uint32_t igrplen = 0;
> + struct xfs_inumbers *inumbers;
> bool moveon = true;
> int i;
> int error;
> @@ -114,19 +113,26 @@ xfs_iterate_inodes_range(
> return false;
> }
>
> + ireq = xfrog_inumbers_alloc_req(1, first_ino);
> + if (!ireq) {
> + str_info(ctx, descr, _("Insufficient memory; giving up."));
> + free(breq);
> + return false;
> + }
> + inumbers = &ireq->inumbers[0];
> +
> /* Find the inode chunk & alloc mask */
> - igrp_ino = first_ino;
> - error = xfrog_inumbers(&ctx->mnt, &igrp_ino, 1, &inogrp, &igrplen);
> - while (!error && igrplen) {
> + error = xfrog_inumbers(&ctx->mnt, ireq);
> + while (!error && ireq->hdr.ocount > 0) {
> /*
> * We can have totally empty inode chunks on filesystems where
> * there are more than 64 inodes per block. Skip these.
> */
> - if (inogrp.xi_alloccount == 0)
> + if (inumbers->xi_alloccount == 0)
> goto igrp_retry;
>
> - breq->hdr.ino = inogrp.xi_startino;
> - breq->hdr.icount = inogrp.xi_alloccount;
> + breq->hdr.ino = inumbers->xi_startino;
> + breq->hdr.icount = inumbers->xi_alloccount;
> error = xfrog_bulkstat(&ctx->mnt, breq);
> if (error) {
> char errbuf[DESCR_BUFSZ];
> @@ -135,11 +141,11 @@ xfs_iterate_inodes_range(
> errbuf, DESCR_BUFSZ));
> }
>
> - xfs_iterate_inodes_range_check(ctx, &inogrp, breq->bulkstat);
> + xfs_iterate_inodes_range_check(ctx, inumbers, breq->bulkstat);
>
> /* Iterate all the inodes. */
> for (i = 0, bs = breq->bulkstat;
> - i < inogrp.xi_alloccount;
> + i < inumbers->xi_alloccount;
> i++, bs++) {
> if (bs->bs_ino > last_ino)
> goto out;
same deal w/ leaking here
> @@ -153,7 +159,7 @@ xfs_iterate_inodes_range(
> case ESTALE:
> stale_count++;
> if (stale_count < 30) {
> - igrp_ino = inogrp.xi_startino;
> + ireq->hdr.ino = inumbers->xi_startino;
> goto igrp_retry;
> }
> snprintf(idescr, DESCR_BUFSZ, "inode %"PRIu64,
> @@ -177,8 +183,7 @@ _("Changed too many times during scan; giving up."));
>
> stale_count = 0;
> igrp_retry:
> - error = xfrog_inumbers(&ctx->mnt, &igrp_ino, 1, &inogrp,
> - &igrplen);
> + error = xfrog_inumbers(&ctx->mnt, ireq);
> }
>
> err:
> @@ -186,6 +191,7 @@ _("Changed too many times during scan; giving up."));
> str_liberror(ctx, error, descr);
> moveon = false;
> }
> + free(ireq);
since the free isn't under out:
> free(breq);
> out:
> return moveon;
>
