On Tue, Jan 18, 2022 at 10:29:10AM -0800, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@xxxxxxxxxx>
>
> Update this utility to use fallocate to preallocate/reserve space to a
> file so that we're not so dependent on legacy XFS ioctls. Fix a minor
> whitespace error while we're at it.
>
> Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
> ---
> v2: fix the fallocate flags for the resvsp replacement code
> ---
> ltp/iogen.c | 34 +++++++++++++++++++++++-----------
> 1 file changed, 23 insertions(+), 11 deletions(-)
>
> diff --git a/ltp/iogen.c b/ltp/iogen.c
> index 2b6644d5..c43cc1d0 100644
> --- a/ltp/iogen.c
> +++ b/ltp/iogen.c
> @@ -922,13 +922,21 @@ bozo!
> f.l_whence = SEEK_SET;
> f.l_start = 0;
> f.l_len = nbytes;
> -
> +
> /*fprintf(stderr,
> "create_file: xfsctl(%d, RESVSP, { %d, %lld, %lld })\n",
> fd, f.l_whence, (long long)f.l_start, (long long)f.l_len);*/
>
> /* non-zeroing reservation */
> -#ifdef XFS_IOC_RESVSP
> +#if defined(FALLOCATE)
> + if (fallocate(fd, FALLOC_FL_KEEP_SIZE, 0, nbytes) == -1) {
gcc warns about
iogen.c: In function 'create_file':
iogen.c:820:20: warning: variable 'f' set but not used [-Wunused-but-set-variable]
820 | struct flock64 f;
| ^
So I replaced 'nbytes' with 'f.l_len' in above fallocate(2) call.
Thanks,
Eryu
> + fprintf(stderr,
> + "iogen%s: Could not fallocate %d bytes in file %s: %s (%d)\n",
> + TagName, nbytes, path, SYSERR, errno);
> + close(fd);
> + return -1;
> + }
> +#elif defined(XFS_IOC_RESVSP)
> if( xfsctl( path, fd, XFS_IOC_RESVSP, &f ) == -1) {
> fprintf(stderr,
> "iogen%s: Could not xfsctl(XFS_IOC_RESVSP) %d bytes in file %s: %s (%d)\n",
> @@ -936,8 +944,7 @@ bozo!
> close(fd);
> return -1;
> }
> -#else
> -#ifdef F_RESVSP
> +#elif defined(F_RESVSP)
> if( fcntl( fd, F_RESVSP, &f ) == -1) {
> fprintf(stderr,
> "iogen%s: Could not fcntl(F_RESVSP) %d bytes in file %s: %s (%d)\n",
> @@ -946,8 +953,7 @@ bozo!
> return -1;
> }
> #else
> -bozo!
> -#endif
> +# error Dont know how to reserve space!
> #endif
> }
>
> @@ -962,7 +968,15 @@ bozo!
> (long long)f.l_len);*/
>
> /* zeroing reservation */
> -#ifdef XFS_IOC_ALLOCSP
> +#if defined(FALLOCATE)
> + if (fallocate(fd, 0, sbuf.st_size, nbytes - sbuf.st_size) == -1) {
> + fprintf(stderr,
> + "iogen%s: Could not fallocate %d bytes in file %s: %s (%d)\n",
> + TagName, nbytes, path, SYSERR, errno);
> + close(fd);
> + return -1;
> + }
> +#elif defined(XFS_IOC_ALLOCSP)
> if( xfsctl( path, fd, XFS_IOC_ALLOCSP, &f ) == -1) {
> fprintf(stderr,
> "iogen%s: Could not xfsctl(XFS_IOC_ALLOCSP) %d bytes in file %s: %s (%d)\n",
> @@ -970,8 +984,7 @@ bozo!
> close(fd);
> return -1;
> }
> -#else
> -#ifdef F_ALLOCSP
> +#elif defined(F_ALLOCSP)
> if ( fcntl(fd, F_ALLOCSP, &f) < 0) {
> fprintf(stderr,
> "iogen%s: Could not fcntl(F_ALLOCSP) %d bytes in file %s: %s (%d)\n",
> @@ -980,8 +993,7 @@ bozo!
> return -1;
> }
> #else
> -bozo!
> -#endif
> +# error Dont know how to (pre)allocate space!
> #endif
> }
> #endif
