korg/e2fsprogs
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git synced 2024-12-03 06:54:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint' into next

Browse Source 
Conflicts:
	misc/tune2fs.c
This commit is contained in:
Theodore Ts'o 2011-05-31 20:08:58 -04:00
commit 3977a4ff5b
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
misc/mke2fs.c
View File

@ -1147,8 +1147,11 @@ static int get_device_geometry(const char *file,
if ((opt_io == 0) && (psector_size > blocksize))
opt_io = psector_size;
fs_param->s_raid_stride = min_io / blocksize;
fs_param->s_raid_stripe_width = opt_io / blocksize;
/* setting stripe/stride to blocksize is pointless */
if (min_io > blocksize)
fs_param->s_raid_stride = min_io / blocksize;
if (opt_io > blocksize)
fs_param->s_raid_stripe_width = opt_io / blocksize;
rc = blkid_topology_get_alignment_offset(tp);
out:

8
misc/tune2fs.c
View File

@ -1705,6 +1705,12 @@ retry_open:
printf(_("Setting reserved blocks gid to %lu\n"), resgid);
}
if (i_flag) {
if (interval >= (1ULL << 32)) {
com_err(program_name, 0,
_("interval between checks is too big (%lu)"),
interval);
exit(1);
}
sb->s_checkinterval = interval;
ext2fs_mark_super_dirty(fs);
printf(_("Setting interval between checks to %lu seconds\n"),
@ -1718,7 +1724,7 @@ retry_open:
reserved_ratio, ext2fs_r_blocks_count(sb));
}
if (r_flag) {
if (reserved_blocks >= ext2fs_blocks_count(sb)/2) {
if (reserved_blocks > ext2fs_blocks_count(sb)/2) {
com_err(program_name, 0,
_("reserved blocks count is too big (%llu)"),
reserved_blocks);