[PATCH] xfstests: fix fiemap-tester when build without fallocate

[PATCH] xfstests: fix fiemap-tester when build without fallocate

[Christoph Hellwig]

Make sure at least the tests passing -p0 like xfstests 225 can work when
built without fallocate support.

Signed-off-by: Christoph Hellwig <hch@lst.de>

Index: xfstests-dev/src/fiemap-tester.c
===================================================================
--- xfstests-dev.orig/src/fiemap-tester.c	2010-04-29 10:32:52.000000000 +0000
+++ xfstests-dev/src/fiemap-tester.c	2010-04-29 10:35:11.000000000 +0000
@@ -37,14 +37,10 @@ static void
 usage(void)
 {
 	printf("Usage: fiemap-tester [-m map] [-r number of runs] [-s seed] [-q]");
-#ifdef HAVE_FALLOCATE
 	printf("[-p preallocate (1/0)] ");
-#endif
 	printf("filename\n");
 	printf("  -m map    : generate a file with the map given and test\n");
-#ifdef HAVE_FALLOCATE
 	printf("  -p 0/1    : turn block preallocation on or off\n");
-#endif
 	printf("  -r count  : number of runs to execute (default infinity)\n");
 	printf("  -s seed   : seed for random map generator (default 1)\n");
 	printf("  -q        : be quiet about non-errors\n");
@@ -513,9 +509,10 @@ main(int argc, char **argv)
 		case 'p':
 			prealloc = atoi(optarg);;
 #ifndef HAVE_FALLOCATE
-			if (prealloc)
+			if (prealloc) {
 				printf("Not built with preallocation support\n");
-			usage();
+				usage();
+			}
 #endif
 			break;
 		case 'q':

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfstests: fix fiemap-tester when build without fallocate

[Eric Sandeen]

Christoph Hellwig wrote:
> Make sure at least the tests passing -p0 like xfstests 225 can work when
> built without fallocate support.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Thanks for doing that.

Reviewed-by: Eric Sandeen <sandeen@sandeen.net>


> Index: xfstests-dev/src/fiemap-tester.c
> ===================================================================
> --- xfstests-dev.orig/src/fiemap-tester.c	2010-04-29 10:32:52.000000000 +0000
> +++ xfstests-dev/src/fiemap-tester.c	2010-04-29 10:35:11.000000000 +0000
> @@ -37,14 +37,10 @@ static void
>  usage(void)
>  {
>  	printf("Usage: fiemap-tester [-m map] [-r number of runs] [-s seed] [-q]");
> -#ifdef HAVE_FALLOCATE
>  	printf("[-p preallocate (1/0)] ");
> -#endif
>  	printf("filename\n");
>  	printf("  -m map    : generate a file with the map given and test\n");
> -#ifdef HAVE_FALLOCATE
>  	printf("  -p 0/1    : turn block preallocation on or off\n");
> -#endif
>  	printf("  -r count  : number of runs to execute (default infinity)\n");
>  	printf("  -s seed   : seed for random map generator (default 1)\n");
>  	printf("  -q        : be quiet about non-errors\n");
> @@ -513,9 +509,10 @@ main(int argc, char **argv)
>  		case 'p':
>  			prealloc = atoi(optarg);;
>  #ifndef HAVE_FALLOCATE
> -			if (prealloc)
> +			if (prealloc) {
>  				printf("Not built with preallocation support\n");
> -			usage();
> +				usage();
> +			}
>  #endif
>  			break;
>  		case 'q':
> 
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs
> 

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs