Merge branch 'maint' into next

pu
Theodore Ts'o 2013-12-09 14:15:04 -05:00
commit 1b977a0fad
2 changed files with 4 additions and 3 deletions

View File

@ -201,7 +201,8 @@ void do_open_filesys(int argc, char **argv)
return;
print_usage:
fprintf(stderr, "%s: Usage: open [-s superblock] [-b blocksize] [-c] "
fprintf(stderr, "%s: Usage: open [-s superblock] [-b blocksize] "
"[-d image_filename] [-c] [-i] [-f] [-e] [-D] "
#ifndef READ_ONLY
"[-w] "
#endif
@ -1042,7 +1043,7 @@ void do_freei(int argc, char *argv[])
!ext2fs_test_inode_bitmap2(current_fs->inode_map,inode))
com_err(argv[0], 0, "Warning: inode already clear");
while (len-- > 0)
ext2fs_unmark_inode_bitmap2(current_fs->inode_map, inode);
ext2fs_unmark_inode_bitmap2(current_fs->inode_map, inode++);
ext2fs_mark_ib_dirty(current_fs);
}

View File

@ -289,7 +289,7 @@ void do_filefrag(int argc, char *argv[])
if (argc > optind+1) {
print_usage:
com_err(0, 0, "Usage: filefrag [-dv] file");
com_err(0, 0, "Usage: filefrag [-dvr] file");
return;
}