linux-ext4 - Re: [PATCH] resize2fs: let online resizing report new blocks count right

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <B2459A4E-E00B-4FC9-9A7C-77B9142F20BD@dilger.ca>
Date:	Sun, 1 Apr 2012 09:19:54 -0600
From:	Andreas Dilger <adilger@...ger.ca>
To:	Yongqiang Yang <xiaoqiangnk@...il.com>
Cc:	"linux-ext4@...r.kernel.org" <linux-ext4@...r.kernel.org>,
	"tytso@....edu" <tytso@....edu>, "dsd@...top.org" <dsd@...top.org>,
	Yongqiang Yang <xiaoqiangnk@...il.com>
Subject: Re: [PATCH] resize2fs: let online resizing report new blocks count right


On 2012-01-31, at 20:04, Yongqiang Yang <xiaoqiangnk@...il.com> wrote:

> After online resizing finishes, resize2fs loads the latest super block
> so that the new blocks count is reported correctly.
> 
> Signed-off-by: Yongqiang Yang <xiaoqiangnk@...il.com>
> ---
> resize/online.c |   16 ++++++++++++++--
> 1 files changed, 14 insertions(+), 2 deletions(-)
> 
> diff --git a/resize/online.c b/resize/online.c
> index 966ea1e..cb48556 100644
> --- a/resize/online.c
> +++ b/resize/online.c
> @@ -97,8 +97,7 @@ errcode_t online_resize_fs(ext2_filsys fs, const char *mtpt,
>            exit(1);
>        }
>    } else {
> -        close(fd);
> -        return 0;
> +        goto succeeded;
>    }
> 
>    if ((ext2fs_blocks_count(sb) > MAX_32_NUM) ||
> @@ -220,6 +219,19 @@ errcode_t online_resize_fs(ext2_filsys fs, const char *mtpt,
>    }
> 
>    ext2fs_free(new_fs);
> +succeeded:
> +    /*
> +     * load the lastest super block.
> +     */
> +    io_channel_set_blksize(fs->io, SUPERBLOCK_OFFSET);
> +    retval = io_channel_read_blk(fs->io, 1, -SUPERBLOCK_SIZE,
> +                 fs->super);

Instead of using io_channel_read_blk() directly it is also possible to use ext2fs_read_block() with a negative size to force it to bypass the ext2fs cache. 

Cheers, Andreas

> +    if (retval == 0)
> +        *new_size = ext2fs_blocks_count(fs->super);
> +    else
> +        printf(_("Resize succeeded, however an error happened "
> +               "when loading super block.\n\n"));
> +
>    close(fd);
> 
>    return 0;
> -- 
> 1.7.5.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html