diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-07-14 22:07:14 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-07-14 22:07:14 +0000 |
| commit | fb79a2e2cfe33002398f1898c26d8e4f341db006 (patch) | |
| tree | f5b3ee27db5bc8c9b181fbec171f8fa430a75ba5 /util-linux/fdisk.c | |
| parent | fcfaf2e18aba06dd90b16958ecfbfcfbf59ceb02 (diff) | |
| download | busybox-w32-fb79a2e2cfe33002398f1898c26d8e4f341db006.tar.gz busybox-w32-fb79a2e2cfe33002398f1898c26d8e4f341db006.tar.bz2 busybox-w32-fb79a2e2cfe33002398f1898c26d8e4f341db006.zip | |
xioctl and friends by Tito <farmatito@tiscali.it>
function old new delta
do_iptunnel 203 977 +774
process_dev 5328 5494 +166
ioctl_or_perror - 54 +54
ioctl_or_perror_and_die - 51 +51
ioctl_alt_func - 49 +49
bb_ioctl_or_warn - 47 +47
do_add_ioctl 102 145 +43
bb_xioctl - 39 +39
print_value_on_off - 31 +31
get_lcm 105 123 +18
arp_main 2155 2167 +12
..................
zcip_main 1576 1566 -10
setlogcons_main 92 82 -10
dumpkmap_main 263 253 -10
do_get_ioctl 85 75 -10
setkeycodes_main 165 154 -11
write_table 244 232 -12
vconfig_main 318 306 -12
do_del_ioctl 93 81 -12
set_address 75 62 -13
maybe_set_utc 30 16 -14
loadfont_main 495 479 -16
slattach_main 712 695 -17
do_loadfont 191 174 -17
do_iplink 1155 1136 -19
getty_main 2583 2562 -21
fbset_main 2058 2035 -23
do_time 588 565 -23
xioctl 25 - -25
read_rtc 186 160 -26
parse_conf 1299 1270 -29
udhcp_read_interface 269 239 -30
bb_ioctl 45 - -45
bb_ioctl_alt 70 - -70
bb_ioctl_on_off 78 - -78
.rodata 129370 129018 -352
do_show 799 - -799
------------------------------------------------------------------------------
(add/remove: 6/5 grow/shrink: 13/49 up/down: 1316/-1864) Total: -548 bytes
text data bss dec hex filename
675352 2740 13968 692060 a8f5c busybox_old
674804 2740 13968 691512 a8d38 busybox_unstripped
Diffstat (limited to 'util-linux/fdisk.c')
| -rw-r--r-- | util-linux/fdisk.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c index 870789112..3b9892fa8 100644 --- a/util-linux/fdisk.c +++ b/util-linux/fdisk.c | |||
| @@ -2434,23 +2434,9 @@ reread_partition_table(int leave) | |||
| 2434 | printf("Calling ioctl() to re-read partition table\n"); | 2434 | printf("Calling ioctl() to re-read partition table\n"); |
| 2435 | sync(); | 2435 | sync(); |
| 2436 | /* sleep(2); Huh? */ | 2436 | /* sleep(2); Huh? */ |
| 2437 | i = ioctl(fd, BLKRRPART); | 2437 | i = ioctl_or_perror(fd, BLKRRPART, NULL, |
| 2438 | #if 0 | 2438 | "WARNING: rereading partition table " |
| 2439 | else { | ||
| 2440 | /* some kernel versions (1.2.x) seem to have trouble | ||
| 2441 | rereading the partition table, but if asked to do it | ||
| 2442 | twice, the second time works. - biro@yggdrasil.com */ | ||
| 2443 | sync(); | ||
| 2444 | sleep(2); | ||
| 2445 | i = ioctl(fd, BLKRRPART); | ||
| 2446 | } | ||
| 2447 | #endif | ||
| 2448 | |||
| 2449 | if (i) { | ||
| 2450 | bb_perror_msg("WARNING: rereading partition table " | ||
| 2451 | "failed, kernel still uses old table"); | 2439 | "failed, kernel still uses old table"); |
| 2452 | } | ||
| 2453 | |||
| 2454 | #if 0 | 2440 | #if 0 |
| 2455 | if (dos_changed) | 2441 | if (dos_changed) |
| 2456 | printf( | 2442 | printf( |