lp:~vcs-imports/e2fsprogs/trunk

Branch merges

This import branch has no branches proposed for merge into it.

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1348431: -O inline_data not supported by Ubuntu e2fsprogs

Undecided

Confirmed

Link a bug report

Related blueprints

3720. By Theodore Ts'o on 2014-08-29

Merge tag 'v1.42.12' into next

v1.42.12

Conflicts:
 version.h

3719. By Darrick J. Wong <email address hidden> on 2014-08-27

e2fsck: fix infinite loop when recovering corrupt journal blocks

When recovering the journal, don't fall into an infinite loop if we
encounter a corrupt journal block. Instead, just skip the block and
proceed with the full filesystem fsck.

Signed-off-by: Darrick J. Wong <email address hidden>
Signed-off-by: Theodore Ts'o <email address hidden>

3718. By Darrick J. Wong <email address hidden> on 2014-08-27

e2fsck: resync jbd2 revoke code from Linux 3.16

Synchronize e2fsck's copy of revoke.c with the kernel's copy in
fs/jbd2.

Signed-off-by: Darrick J. Wong <email address hidden>
Signed-off-by: Theodore Ts'o <email address hidden>

3717. By Darrick J. Wong <email address hidden> on 2014-08-27

e2fsck: resync jbd2 recovery code from Linux 3.16

Synchronize e2fsck's copy of recovery.c with the kernel's copy in
fs/jbd2.

Signed-off-by: Darrick J. Wong <email address hidden>
Signed-off-by: Theodore Ts'o <email address hidden>

3716. By Darrick J. Wong <email address hidden> on 2014-08-27

contrib: add script to help resync journal code with kernel

Add a script that handles (most) of the code massaging necessary to resync
{recovery,revoke}.c from the Linux kernel into e2fsprogs.

Usage: jbd2-resync.sh linux/fs/jbd2/revoke.c e2fsprogs/e2fsck/revoke.c

Signed-off-by: Darrick J. Wong <email address hidden>
Signed-off-by: Theodore Ts'o <email address hidden>

3715. By Theodore Ts'o on 2014-08-25

Merge branch 'maint' into next

Conflicts:
 RELEASE-NOTES
 debian/changelog
 version.h

3714. By Theodore Ts'o on 2014-08-25

tests/d_inline_dump: remove version dependency in the expected output

Also add the convenience macro $CLEAN_OUTPUT in test_config which can
be used to run the "sed -e $cmd_dir/filter.sed" command to clean up
e2fsprogs command output before comparing with the expected golden
output.

Signed-off-by: Theodore Ts'o <email address hidden>

3713. By Darrick J. Wong <email address hidden> on 2014-08-25

e2fsck: on BE, re-swap everything after a damaged dirent so salvage works correctly

On big-endian systems, if the dirent swap routine finds a rec_len that
it doesn't like, it continues processing the block as if rec_len == 8.
This means that the name field gets byte swapped, which means that
salvage will not detect the correct name length (unless the name has a
length that's an exact multiple of four bytes), and it'll discard the
entry (unnecessarily) and the rest of the dirent block. Therefore,
swap the rest of the block back to disk order, run salvage, and
re-swap anything after the salvaged dirent.

The test case for this is f_inlinedata_repair if you run it on a BE
system.

Signed-off-by: Darrick J. Wong <email address hidden>
Signed-off-by: Theodore Ts'o <email address hidden>

3712. By Darrick J. Wong <email address hidden> on 2014-08-25

libext2fs: fix problems with LE<->BE conversions on BE platforms

Fix more problems that I found when testing on ppc64:

- Inode swap cut and paste error leads to immutable inodes being
  detected as inlinedata inodes, leading to e2fsck incorrectly barfing
  on i_block[] contents.

- Superblock csum/verify must be aware of the fs->super byte order
  when checking for metadata_csum feature flag. (Hint: in _openfs(),
  fs->super is in LE order for the first csum verification)

Signed-off-by: Darrick J. Wong <email address hidden>
Signed-off-by: Theodore Ts'o <email address hidden>

3711. By Darrick J. Wong <email address hidden> on 2014-08-25

libext2fs: byteswap inode when performing the sanity scan

On BE platforms, we need to swap the inode bytes after doing the
checksum verification but before looking at i_blocks.

Signed-off-by: Darrick J. Wong <email address hidden>
Signed-off-by: Theodore Ts'o <email address hidden>