Avoid a naming conflict with include/bits/fcntl.h
This commit is contained in:
parent
bd8dd1e763
commit
f828da0020
@ -1226,7 +1226,7 @@ static int verbose = 0, get_identity = 0, get_geom = 0, noisy = 1, quiet = 0;
|
||||
static int flagcount = 0, do_flush = 0, is_scsi_hd = 0, is_xt_hd = 0;
|
||||
static int do_ctimings, do_timings = 0;
|
||||
|
||||
static unsigned long set_readahead= 0, get_readahead= 0, readahead= 0;
|
||||
static unsigned long set_readahead= 0, get_readahead= 0, Xreadahead= 0;
|
||||
static unsigned long set_readonly = 0, get_readonly = 0, readonly = 0;
|
||||
static unsigned long set_unmask = 0, get_unmask = 0, unmask = 0;
|
||||
static unsigned long set_mult = 0, get_mult = 0, mult = 0;
|
||||
@ -1936,8 +1936,8 @@ static void process_dev (char *devname)
|
||||
|
||||
if (set_readahead)
|
||||
{
|
||||
if_printf(get_readahead," setting fs readahead to %ld\n", readahead);
|
||||
bb_ioctl(fd, BLKRASET,(int *)readahead,"BLKRASET");
|
||||
if_printf(get_readahead," setting fs readahead to %ld\n", Xreadahead);
|
||||
bb_ioctl(fd, BLKRASET,(int *)Xreadahead,"BLKRASET");
|
||||
}
|
||||
#ifdef CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF
|
||||
if (unregister_hwif)
|
||||
@ -2829,7 +2829,7 @@ expected_hwif_error:
|
||||
noisy = 1;
|
||||
if (!*p && argc && isalnum(**argv))
|
||||
p = *argv++, --argc;
|
||||
p=GET_NUMBER(p,&set_readahead,&readahead);
|
||||
p=GET_NUMBER(p,&set_readahead,&Xreadahead);
|
||||
break;
|
||||
case 'B':
|
||||
get_apmmode = noisy;
|
||||
|
Loading…
Reference in New Issue
Block a user