mirror of https://github.com/vitalif/e2fsprogs
Merge branch 'maint' into next
commit
29f6dfea52
|
@ -640,6 +640,7 @@ LINUX_CMT
|
|||
UNI_DIFF_OPTS
|
||||
SEM_INIT_LIB
|
||||
SOCKET_LIB
|
||||
SIZEOF_OFF_T
|
||||
SIZEOF_LONG_LONG
|
||||
SIZEOF_LONG
|
||||
SIZEOF_INT
|
||||
|
@ -10651,10 +10652,45 @@ cat >>confdefs.h <<_ACEOF
|
|||
_ACEOF
|
||||
|
||||
|
||||
# The cast to long int works around a bug in the HP C Compiler
|
||||
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
|
||||
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
|
||||
# This bug is HP SR number 8606223364.
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5
|
||||
$as_echo_n "checking size of off_t... " >&6; }
|
||||
if ${ac_cv_sizeof_off_t+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t" "$ac_includes_default"; then :
|
||||
|
||||
else
|
||||
if test "$ac_cv_type_off_t" = yes; then
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||
as_fn_error 77 "cannot compute sizeof (off_t)
|
||||
See \`config.log' for more details" "$LINENO" 5; }
|
||||
else
|
||||
ac_cv_sizeof_off_t=0
|
||||
fi
|
||||
fi
|
||||
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5
|
||||
$as_echo "$ac_cv_sizeof_off_t" >&6; }
|
||||
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define SIZEOF_OFF_T $ac_cv_sizeof_off_t
|
||||
_ACEOF
|
||||
|
||||
|
||||
SIZEOF_SHORT=$ac_cv_sizeof_short
|
||||
SIZEOF_INT=$ac_cv_sizeof_int
|
||||
SIZEOF_LONG=$ac_cv_sizeof_long
|
||||
SIZEOF_LONG_LONG=$ac_cv_sizeof_long_long
|
||||
SIZEOF_OFF_T=$ac_cv_sizeof_off_t
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -419,9 +419,19 @@ static errcode_t e2fsck_get_journal(e2fsck_t ctx, journal_t **ret_journal)
|
|||
#ifndef USE_INODE_IO
|
||||
if (ext_journal)
|
||||
#endif
|
||||
retval = io_ptr->open(journal_name,
|
||||
IO_FLAG_RW | IO_FLAG_EXCLUSIVE,
|
||||
{
|
||||
int flags = IO_FLAG_RW;
|
||||
if (!(ctx->mount_flags & EXT2_MF_ISROOT &&
|
||||
ctx->mount_flags & EXT2_MF_READONLY))
|
||||
flags |= IO_FLAG_EXCLUSIVE;
|
||||
if ((ctx->mount_flags & EXT2_MF_READONLY) &&
|
||||
(ctx->options & E2F_OPT_FORCE))
|
||||
flags &= ~IO_FLAG_EXCLUSIVE;
|
||||
|
||||
|
||||
retval = io_ptr->open(journal_name, flags,
|
||||
&ctx->journal_io);
|
||||
}
|
||||
if (retval)
|
||||
goto errout;
|
||||
|
||||
|
|
|
@ -307,7 +307,7 @@ static void check_ea_in_inode(e2fsck_t ctx, struct problem_context *pctx)
|
|||
remain -= EXT2_EXT_ATTR_SIZE(entry->e_name_len);
|
||||
|
||||
/* check value size */
|
||||
if (entry->e_value_size == 0 || entry->e_value_size > remain) {
|
||||
if (entry->e_value_size > remain) {
|
||||
pctx->num = entry->e_value_size;
|
||||
problem = PR_1_ATTR_VALUE_SIZE;
|
||||
goto fix;
|
||||
|
|
|
@ -168,8 +168,8 @@ was written by Remy Card <Remy.Card@linux.org>. It is currently being
|
|||
maintained by Theodore Ts'o <tytso@alum.mit.edu>.
|
||||
.SH BUGS AND LIMITATIONS
|
||||
The `c', 's', and `u' attributes are not honored
|
||||
by the ext2 and ext3 filesystems as implemented in the current mainline
|
||||
Linux kernels.
|
||||
by the ext2, ext3, and ext4 filesystems as implemented in the current
|
||||
mainline Linux kernels.
|
||||
.PP
|
||||
The `j' option is only useful if the filesystem is mounted as ext3.
|
||||
.PP
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
Pass 1: Checking inodes, blocks, and sizes
|
||||
Pass 2: Checking directory structure
|
||||
Pass 3: Checking directory connectivity
|
||||
Pass 4: Checking reference counts
|
||||
Pass 5: Checking group summary information
|
||||
test_filesys: 12/24 files (0.0% non-contiguous), 25/200 blocks
|
||||
Exit status is 0
|
Binary file not shown.
|
@ -0,0 +1 @@
|
|||
zero length extended attribute in in-inode xattr
|
|
@ -0,0 +1,2 @@
|
|||
ONE_PASS_ONLY="true"
|
||||
. $cmd_dir/run_e2fsck
|
Loading…
Reference in New Issue