vitalif
/
e2fsprogs
mirror of https://github.com/vitalif/e2fsprogs
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'maint' into next

crypto
Theodore Ts'o 2014-03-06 10:53:34 -05:00
parent 3125348838 9aef4b6954
commit 46d2a26683
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/control.in vendored
View File

@ -124,7 +124,7 @@ Description: runtime components for the Universally Unique ID library
different CPU’s. It is used by libuuid as well as the uuidgen
program.
ifdef(`UDEV_PKGS',``
ifdef(`UDEB_PKGS',``
Package: libuuid1-udeb
XC-Package-Type: udeb
Section: debian-installer
@ -161,7 +161,7 @@ Description: block device id library
filesystems by hard-coded device names, but via a logical naming
system instead.
ifdef(`UDEV_PKGS',``
ifdef(`UDEB_PKGS',``
Package: libblkid1-udeb
XC-Package-Type: udeb
Section: debian-installer
@ -193,7 +193,7 @@ Description: block device id library - headers and static libraries
This package contains the development environment for the blkid library.
'')dnl
ifdef(`UDEV_PKGS',``
ifdef(`UDEB_PKGS',``
Package: e2fsprogs-udeb
XC-Package-Type: udeb
Section: debian-installer
@ -204,7 +204,7 @@ Description: stripped-down versions of e2fsprogs, for debian-installer
This package is an e2fsprogs package built for a reduced size, so that
it can help to save space in debian-installer.
.
Don't attempt to install this package, it has no support for a couple of
Don'''``t attempt to install this package, it has no support for a couple of
features you surely want. Anyway it should refuse to install.
'')dnl

7
e2fsck/unix.c
View File

@ -749,6 +749,7 @@ static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx)
return retval;
*ret_ctx = ctx;
e2fsck_global_ctx = ctx;
setvbuf(stdout, NULL, _IONBF, BUFSIZ);
setvbuf(stderr, NULL, _IONBF, BUFSIZ);
@ -990,7 +991,6 @@ static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx)
#ifdef SA_RESTART
sa.sa_flags = SA_RESTART;
#endif
e2fsck_global_ctx = ctx;
sa.sa_handler = signal_progress_on;
sigaction(SIGUSR1, &sa, 0);
sa.sa_handler = signal_progress_off;
@ -1066,9 +1066,11 @@ static errcode_t try_open_fs(e2fsck_t ctx, int flags, io_manager io_ptr,
retval = ext2fs_open2(ctx->filesystem_name, ctx->io_options,
flags, 0, 0, io_ptr, ret_fs);
if (retval == 0)
if (retval == 0) {
(*ret_fs)->priv_data = ctx;
e2fsck_set_bitmap_type(*ret_fs, EXT2FS_BMAP64_RBTREE,
"default", NULL);
}
return retval;
}
@ -1423,7 +1425,6 @@ failure:
}
ctx->fs = fs;
fs->priv_data = ctx;
fs->now = ctx->now;
sb = fs->super;

8
e2fsck/util.c
View File

@ -794,13 +794,13 @@ void e2fsck_set_bitmap_type(ext2_filsys fs, unsigned int default_type,
const char *profile_name, unsigned int *old_type)
{
unsigned type;
e2fsck_t ctx = (e2fsck_t) fs->priv_data;
if (old_type)
*old_type = fs->default_bitmap_type;
profile_get_uint(e2fsck_global_ctx->profile, "bitmaps",
profile_name, 0, default_type, &type);
profile_get_uint(e2fsck_global_ctx->profile, "bitmaps",
"all", 0, type, &type);
profile_get_uint(ctx->profile, "bitmaps", profile_name, 0,
default_type, &type);
profile_get_uint(ctx->profile, "bitmaps", "all", 0, type, &type);
fs->default_bitmap_type = type ? type : default_type;
}

3
misc/mke2fs.c
View File

@ -1983,6 +1983,9 @@ profile_error:
* We now need to do a sanity check of fs_blocks_count for
* 32-bit vs 64-bit block number support.
*/
if ((fs_blocks_count > MAX_32_NUM) &&
(fs_param.s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT))
fs_param.s_feature_compat &= ~EXT2_FEATURE_COMPAT_RESIZE_INODE;
if ((fs_blocks_count > MAX_32_NUM) &&
!(fs_param.s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT) &&
get_bool_from_profile(fs_types, "auto_64-bit_support", 0)) {