badblocks: Use unsigned int instead of unsigned long for test patterns
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 badblocks: Use unsigned int instead of unsigned long for test patterns
Signed-off-by "Theodore Ts'o" <[email protected]>
--- misc/badblocks.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-)
misc/badblocks.c +11 -11
@@ -67,7 +67,7 @@ static int s_flag = 0; /* show progress of test */static int force =0 ;/* force check of mounted device */ static int t_flag =0 ;/* number of test patterns */ static int t_max =0 ;/* allocated test patterns */ -static unsigned long *t_patts =NULL ;/* test patterns */ +static unsigned int *t_patts =NULL ;/* test patterns */ static int current_O_DIRECT =0 ;/* Current status of O_DIRECT flag */ static int exclusive_ok =0 ;
@@ -221,13 +221,13 @@ static void set_o_direct(int dev, unsigned char *buffer, size_t size, } -static void pattern_fill (unsigned char *buffer,unsigned long pattern, +static void pattern_fill (unsigned char *buffer,unsigned int pattern,size_t n) {unsigned int i, nb;unsigned char bpattern[sizeof (pattern)], *ptr; -if (pattern == (unsigned long ) ~0 ) { +if (pattern == (unsigned int ) ~0 ) {for (ptr = buffer; ptr < buffer + n; ptr++) { (*ptr) =random () % (1 << (8 *sizeof (char ))); }
@@ -435,8 +435,8 @@ static unsigned int test_rw (int dev, unsigned long last_block, unsigned long blocks_at_once) {unsigned char *buffer, *read_buffer; -const unsigned long patterns[] = {0xaa ,0x55 ,0xff ,0x00 }; -const unsigned long *pattern; +const unsigned int patterns[] = {0xaa ,0x55 ,0xff ,0x00 }; +const unsigned int *pattern;int i, try, got, nr_pattern, pat_idx;unsigned int bb_count =0 ;
@@ -562,8 +562,8 @@ static unsigned int test_nd (int dev, unsigned long last_block,unsigned char *blkbuf, *save_ptr, *test_ptr, *read_ptr;unsigned char *test_base, *save_base, *read_base;int try, i; -const unsigned long patterns[] = { ~0 }; -const unsigned long *pattern; +const unsigned int patterns[] = { ~0 }; +const unsigned int *pattern;int nr_pattern, pat_idx;long got, used2, written, save_currently_testing;struct saved_blk_record *test_record;
@@ -830,7 +830,7 @@ int main (int argc, char ** argv)int passes_clean =0 ;int dev;errcode_t errcode; -unsigned long pattern; +unsigned int pattern;unsigned int (*test_func)(int ,unsigned long ,int ,unsigned long ,unsigned long );
@@ -920,7 +920,7 @@ int main (int argc, char ** argv)break ;case 't' :if (t_flag +1 > t_max) { -unsigned long *t_patts_new; +unsigned int *t_patts_new; t_patts_new =realloc (t_patts, t_max +T_INC );if (!t_patts_new) {
@@ -943,7 +943,7 @@ int main (int argc, char ** argv) optarg);exit (1 ); } -if (pattern == (unsigned long ) ~0 ) +if (pattern == (unsigned int ) ~0 ) pattern =0xffff ; t_patts[t_flag++] = pattern; }
@@ -962,7 +962,7 @@ int main (int argc, char ** argv) "in read-only mode"));exit (1 ); } -if (t_patts && (t_patts[0 ] == (unsigned long ) ~0 )) { +if (t_patts && (t_patts[0 ] == (unsigned int ) ~0 )) {com_err (program_name,0 ,_ ("Random test_pattern is not allowed " "in read-only mode" ));
Signature · 1 line
1.5.3.4.1232.g9991d-dirty
PATCH 1/1 badblocks: Change unsigned long to blk_t and unsigned int, as appropriate
This will make it easier for us to support 64-bit block numbers when the time comes. Not that running badblocks on a > 4TB machine is anything I want to contemplate!
Signed-off-by "Theodore Ts'o" <[email protected]>
--- misc/badblocks.c | 74 +++++++++++++++++++++++++++++------------------------ 1 files changed, 40 insertions(+), 34 deletions(-)
misc/badblocks.c +40 -34
@@ -73,7 +73,7 @@ static int exclusive_ok = 0;#define T_INC 32 -int sys_page_size =4096 ; +unsigned int sys_page_size =4096 ;static void usage (void ) {
@@ -90,8 +90,8 @@ static void exclusive_usage(void)exit (1 ); } -static unsigned long currently_testing =0 ; -static unsigned long num_blocks =0 ; +static blk_t currently_testing =0 ; +static blk_t num_blocks =0 ;static ext2_badblocks_list bb_list =NULL ;static FILE *out;static blk_t next_bad =0 ;
@@ -124,14 +124,14 @@ static void *allocate_buffer(size_t size)* This routine reports a new bad block. If the bad block has already * been seen before, then it returns 0; otherwise it returns 1. */ -static int bb_output (unsigned long bad) +static int bb_output (blk_t bad) {errcode_t errcode;if (ext2fs_badblocks_list_test (bb_list, bad))return 0 ; -fprintf (out,"%lu\n" , bad); +fprintf (out,"%lu\n" , (unsigned long ) bad);fflush (out); errcode =ext2fs_badblocks_list_add (bb_list, bad);
@@ -151,7 +151,8 @@ static int bb_output (unsigned long bad)static void print_status (void ) { -fprintf (stderr,"%15ld/%15ld" , currently_testing, num_blocks); +fprintf (stderr,"%15lu/%15lu" , (unsigned long ) currently_testing, + (unsigned long ) num_blocks);fputs ("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b" , stderr);fflush (stderr); }
@@ -197,7 +198,7 @@ static void uncapture_terminate(void) }static void set_o_direct (int dev,unsigned char *buffer,size_t size, -unsigned long current_block) +blk_t current_block) {#ifdef O_DIRECT int new_flag =O_DIRECT ;
@@ -262,8 +263,8 @@ static void pattern_fill(unsigned char *buffer, unsigned int pattern,* Perform a read of a sequence of blocks; return the number of blocks * successfully sequentially read. */ -static long do_read (int dev,unsigned char * buffer,int try,int block_size, -unsigned long current_block) +static int do_read (int dev,unsigned char * buffer,int try,int block_size, +blk_t current_block) {long got;
@@ -291,8 +292,8 @@ static long do_read (int dev, unsigned char * buffer, int try, int block_size,* Perform a write of a sequence of blocks; return the number of blocks * successfully sequentially written. */ -static long do_write (int dev,unsigned char * buffer,int try,int block_size, -unsigned long current_block) +static int do_write (int dev,unsigned char * buffer,int try,int block_size, +unsigned long current_block) {long got;
@@ -327,13 +328,13 @@ static void flush_bufs(void)com_err (program_name, retval,_ ("during ext2fs_sync_device" )); } -static unsigned int test_ro (int dev,unsigned long last_block, -int block_size,unsigned long from_count, -unsigned long blocks_at_once) +static unsigned int test_ro (int dev,blk_t last_block, +int block_size,blk_t from_count, +unsigned int blocks_at_once) {unsigned char * blkbuf;int try; -long got; +int got;unsigned int bb_count =0 ;errcode_t errcode;
@@ -358,8 +359,9 @@ static unsigned int test_ro (int dev, unsigned long last_block,exit (1 ); }if (v_flag) { -fprintf (stderr,_ ("Checking blocks %lu to %lu\n" ), from_count, - last_block -1 ); +fprintf (stderr,_ ("Checking blocks %lu to %lu\n" ), + (unsigned long ) from_count, + (unsigned long ) last_block -1 ); }if (t_flag) {fputs (_ ("Checking for bad blocks in read-only mode\n" ), stderr);
@@ -404,7 +406,7 @@ static unsigned int test_ro (int dev, unsigned long last_block,if (got == try) { try = blocks_at_once;/* recover page-aligned offset for O_DIRECT */ -if ( blocks_at_once >= (unsigned long ) (sys_page_size >>9 ) +if ( (blocks_at_once >= sys_page_size >>9 ) && (currently_testing % (sys_page_size >>9 )!=0 )) try -= (sys_page_size >>9 ) - (currently_testing
@@ -430,9 +432,9 @@ static unsigned int test_ro (int dev, unsigned long last_block,return bb_count; } -static unsigned int test_rw (int dev,unsigned long last_block, -int block_size,unsigned long from_count, -unsigned long blocks_at_once) +static unsigned int test_rw (int dev,blk_t last_block, +int block_size,blk_t from_count, +unsigned int blocks_at_once) {unsigned char *buffer, *read_buffer;const unsigned int patterns[] = {0xaa ,0x55 ,0xff ,0x00 };
@@ -454,7 +456,8 @@ static unsigned int test_rw (int dev, unsigned long last_block,fputs (_ ("Checking for bad blocks in read-write mode\n" ), stderr);fprintf (stderr,_ ("From block %lu to %lu\n" ), - from_count, last_block); + (unsigned long ) from_count, + (unsigned long ) last_block); }if (t_flag) { pattern = t_patts;
@@ -484,7 +487,7 @@ static unsigned int test_rw (int dev, unsigned long last_block,if (got == try) { try = blocks_at_once;/* recover page-aligned offset for O_DIRECT */ -if ( blocks_at_once >= (unsigned long ) (sys_page_size >>9 ) +if ( (blocks_at_once >= sys_page_size >>9 ) && (currently_testing % (sys_page_size >>9 )!=0 )) try -= (sys_page_size >>9 )
@@ -528,7 +531,7 @@ static unsigned int test_rw (int dev, unsigned long last_block, } currently_testing += got;/* recover page-aligned offset for O_DIRECT */ -if ( blocks_at_once >= (unsigned long ) (sys_page_size >>9 ) +if ( (blocks_at_once >= sys_page_size >>9 ) && (currently_testing % (sys_page_size >>9 )!=0 )) try = blocks_at_once - (sys_page_size >>9 ) - (currently_testing
@@ -555,9 +558,9 @@ struct saved_blk_record {int num; }; -static unsigned int test_nd (int dev,unsigned long last_block, -int block_size,unsigned long from_count, -unsigned long blocks_at_once) +static unsigned int test_nd (int dev,blk_t last_block, +int block_size,blk_t from_count, +unsigned int blocks_at_once) {unsigned char *blkbuf, *save_ptr, *test_ptr, *read_ptr;unsigned char *test_base, *save_base, *read_base;
@@ -565,7 +568,8 @@ static unsigned int test_nd (int dev, unsigned long last_block,const unsigned int patterns[] = { ~0 };const unsigned int *pattern;int nr_pattern, pat_idx; -long got, used2, written, save_currently_testing; +int got, used2, written; +blk_t save_currently_testing;struct saved_blk_record *test_record;/* This is static to prevent being clobbered by the longjmp */ static int num_saved;
@@ -601,7 +605,8 @@ static unsigned int test_nd (int dev, unsigned long last_block,flush_bufs ();if (v_flag) {fputs (_ ("Checking for bad blocks in non-destructive read-write mode\n" ), stderr); -fprintf (stderr,_ ("From block %lu to %lu\n" ), from_count, last_block); +fprintf (stderr,_ ("From block %lu to %lu\n" ), + (unsigned long ) from_count, (unsigned long ) last_block); }if (s_flag || v_flag >1 ) {fputs (_ ("Checking for bad blocks (non-destructive read-write test)\n" ), stderr);
@@ -682,7 +687,8 @@ static unsigned int test_nd (int dev, unsigned long last_block,if (written != got)com_err (program_name, errno,_ ("during test data write, block %lu" ), - currently_testing + written); + (unsigned long ) currently_testing + + written); buf_used += got; save_ptr += got * block_size;
@@ -824,16 +830,16 @@ int main (int argc, char ** argv)char * output_file =NULL ;FILE * in =NULL ;int block_size =1024 ; -unsigned long blocks_at_once =64 ; +unsigned int blocks_at_once =64 ;blk_t last_block, from_count;int num_passes =0 ;int passes_clean =0 ;int dev;errcode_t errcode;unsigned int pattern; -unsigned int (*test_func)(int ,unsigned long , -int ,unsigned long , -unsigned long ); +unsigned int (*test_func)(int ,blk_t , +int ,blk_t , +unsigned int );int open_flag =0 ;long sysval;
Signature · 1 line
1.5.3.4.1232.g9991d-dirty
PATCH 1/1 badblocks: Factor out calls to strtoul to a helper function
The strtoul() function has a lot of messy error checking that needs to be done; by factoring it out into one place we can make sure it's done right in all of the places where it is called.
Signed-off-by "Theodore Ts'o" <[email protected]>
--- misc/badblocks.c | 61 ++++++++++++++++++++++------------------------------- 1 files changed, 25 insertions(+), 36 deletions(-)
misc/badblocks.c +25 -36
@@ -819,11 +819,27 @@ static void check_mount(char *device_name) } +/* +* This function will convert a string to an unsigned long, printing +* an error message if it fails, and returning success or failure in err. +*/ +static unsigned int parse_uint (const char *str,const char *descr) +{ +char *tmp; +unsigned long ret; + + ret =strtoul (str, &tmp,0 ); +if (*tmp || errno || (ret >UINT_MAX ) || + (ret ==ULONG_MAX && errno ==ERANGE )) { +com_err (program_name,0 ,_ ("invalid %s - %s" ), descr, str); +exit (1 ); + } +return ret; +}int main (int argc,char ** argv) {int c; -char * tmp;char * device_name;char * host_device_name =NULL ;char * input_file =NULL ;
@@ -871,8 +887,8 @@ int main (int argc, char ** argv)while ((c =getopt (argc, argv,"b:fi:o:svwnc:p:h:t:X" )) !=EOF ) {switch (c) {case 'b' : - block_size =strtoul (optarg, &tmp,0 ); -if (*tmp || block_size >4096 ) { + block_size =parse_uint (optarg,"block size" ); +if (block_size >4096 ) {com_err (program_name,0 ,_ ("bad block size - %s" ), optarg);exit (1 );
@@ -906,20 +922,11 @@ int main (int argc, char ** argv) w_flag =2 ;break ;case 'c' : - blocks_at_once =strtoul (optarg, &tmp,0 ); -if (*tmp) { -com_err (program_name,0 , -"bad simultaneous block count - %s" , optarg); -exit (1 ); - } + blocks_at_once =parse_uint (optarg,"blocks at once" );break ;case 'p' : - num_passes =strtoul (optarg, &tmp,0 ); -if (*tmp) { -com_err (program_name,0 , -"bad number of clean passes - %s" , optarg); -exit (1 ); - } + num_passes =parse_uint (optarg, +"number of clean passes" );break ;case 'h' : host_device_name = optarg;
@@ -942,13 +949,7 @@ int main (int argc, char ** argv)if (!strcmp (optarg,"r" ) || !strcmp (optarg,"random" )) { t_patts[t_flag++] = ~0 ; }else { - pattern =strtoul (optarg, &tmp,0 ); -if (*tmp) { -com_err (program_name,0 , -_ ("invalid test_pattern: %s\n" ), - optarg); -exit (1 ); - } + pattern =parse_uint (optarg,"test pattern" );if (pattern == (unsigned int ) ~0 ) pattern =0xffff ; t_patts[t_flag++] = pattern;
@@ -995,27 +996,15 @@ int main (int argc, char ** argv) } }else { errno =0 ; - last_block =strtoul (argv[optind], &tmp,0 ); + last_block =parse_uint (argv[optind],"last block" );printf ("last_block = %d (%s)\n" , last_block, argv[optind]); -if (*tmp || errno || - (last_block ==ULONG_MAX && errno ==ERANGE )) { -com_err (program_name,0 ,_ ("invalid blocks count - %s" ), - argv[optind]); -exit (1 ); - } last_block++; optind++; }if (optind <= argc-1 ) { errno =0 ; - from_count =strtoul (argv[optind], &tmp,0 ); + from_count =parse_uint (argv[optind],"start block" );printf ("from_count = %d\n" , from_count); -if (*tmp || errno || - (from_count ==ULONG_MAX && errno ==ERANGE )) { -com_err (program_name,0 ,_ ("invalid starting block - %s" ), - argv[optind]); -exit (1 ); - } }else from_count =0 ;if (from_count >= last_block) { com_err (program_name, 0, _("invalid starting block (%lu): must be less than %lu"),
Signature · 1 line
1.5.3.4.1232.g9991d-dirty