aboutsummaryrefslogtreecommitdiff
path: root/e2fsprogs/tune2fs.c
diff options
context:
space:
mode:
Diffstat (limited to 'e2fsprogs/tune2fs.c')
-rw-r--r--e2fsprogs/tune2fs.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/e2fsprogs/tune2fs.c b/e2fsprogs/tune2fs.c
index f23688bc3..f228c56aa 100644
--- a/e2fsprogs/tune2fs.c
+++ b/e2fsprogs/tune2fs.c
@@ -163,7 +163,7 @@ no_valid_journal:
163 163
164/* Helper function for remove_journal_inode */ 164/* Helper function for remove_journal_inode */
165static int release_blocks_proc(ext2_filsys fs, blk_t *blocknr, 165static int release_blocks_proc(ext2_filsys fs, blk_t *blocknr,
166 int blockcnt EXT2FS_ATTR((unused)), 166 int blockcnt EXT2FS_ATTR((unused)),
167 void *private EXT2FS_ATTR((unused))) 167 void *private EXT2FS_ATTR((unused)))
168{ 168{
169 blk_t block; 169 blk_t block;
@@ -187,9 +187,9 @@ static void remove_journal_inode(ext2_filsys fs)
187 ino_t ino = fs->super->s_journal_inum; 187 ino_t ino = fs->super->s_journal_inum;
188 char *msg = "to read"; 188 char *msg = "to read";
189 char *s = "journal inode"; 189 char *s = "journal inode";
190 190
191 retval = ext2fs_read_inode(fs, ino, &inode); 191 retval = ext2fs_read_inode(fs, ino, &inode);
192 if (retval) 192 if (retval)
193 goto REMOVE_JOURNAL_INODE_ERROR; 193 goto REMOVE_JOURNAL_INODE_ERROR;
194 if (ino == EXT2_JOURNAL_INO) { 194 if (ino == EXT2_JOURNAL_INO) {
195 retval = ext2fs_read_bitmaps(fs); 195 retval = ext2fs_read_bitmaps(fs);
@@ -343,13 +343,13 @@ static void add_journal(ext2_filsys fs)
343 return; 343 return;
344} 344}
345 345
346/* 346/*
347 * Busybox stuff 347 * Busybox stuff
348 */ 348 */
349static char * x_blkid_get_devname(const char *token) 349static char * x_blkid_get_devname(const char *token)
350{ 350{
351 char * dev_name; 351 char * dev_name;
352 352
353 if (!(dev_name = blkid_get_devname(NULL, token, NULL))) 353 if (!(dev_name = blkid_get_devname(NULL, token, NULL)))
354 bb_error_msg_and_die("Unable to resolve '%s'", token); 354 bb_error_msg_and_die("Unable to resolve '%s'", token);
355 return dev_name; 355 return dev_name;
@@ -368,11 +368,11 @@ static void parse_e2label_options(int argc, char ** argv)
368 open_flag = EXT2_FLAG_RW | EXT2_FLAG_JOURNAL_DEV_OK; 368 open_flag = EXT2_FLAG_RW | EXT2_FLAG_JOURNAL_DEV_OK;
369 L_flag = 1; 369 L_flag = 1;
370 new_label = argv[2]; 370 new_label = argv[2];
371 } else 371 } else
372 print_label++; 372 print_label++;
373} 373}
374#else 374#else
375#define parse_e2label_options(x,y) 375#define parse_e2label_options(x,y)
376#endif 376#endif
377 377
378static time_t parse_time(char *str) 378static time_t parse_time(char *str)
@@ -516,7 +516,7 @@ MOUNTS_COUNT_ERROR:
516 mntopts_cmd = optarg; 516 mntopts_cmd = optarg;
517 open_flag = EXT2_FLAG_RW; 517 open_flag = EXT2_FLAG_RW;
518 break; 518 break;
519 519
520 case 'O': 520 case 'O':
521 if (features_cmd) { 521 if (features_cmd) {
522 bb_error_msg_and_die("-O may only be specified once"); 522 bb_error_msg_and_die("-O may only be specified once");
@@ -594,7 +594,7 @@ int tune2fs_main(int argc, char **argv)
594 594
595 if (ENABLE_FEATURE_CLEAN_UP) 595 if (ENABLE_FEATURE_CLEAN_UP)
596 atexit(clean_up); 596 atexit(clean_up);
597 597
598 if (ENABLE_FINDFS && (bb_applet_name[0] == 'f')) /* findfs */ 598 if (ENABLE_FINDFS && (bb_applet_name[0] == 'f')) /* findfs */
599 do_findfs(argc, argv); /* no return */ 599 do_findfs(argc, argv); /* no return */
600 else if (ENABLE_E2LABEL && (bb_applet_name[0] == 'e')) /* e2label */ 600 else if (ENABLE_E2LABEL && (bb_applet_name[0] == 'e')) /* e2label */
@@ -603,7 +603,7 @@ int tune2fs_main(int argc, char **argv)
603 parse_tune2fs_options(argc, argv); /* tune2fs */ 603 parse_tune2fs_options(argc, argv); /* tune2fs */
604 604
605 io_ptr = unix_io_manager; 605 io_ptr = unix_io_manager;
606 retval = ext2fs_open2(device_name, io_options, open_flag, 606 retval = ext2fs_open2(device_name, io_options, open_flag,
607 0, 0, io_ptr, &fs); 607 0, 0, io_ptr, &fs);
608 if (retval) 608 if (retval)
609 bb_error_msg_and_die("No valid superblock on %s", device_name); 609 bb_error_msg_and_die("No valid superblock on %s", device_name);