Whamcloud - gitweb
e2fsck: fix merge error in "clear uninit flag on directory extents"
authorDarrick J. Wong <darrick.wong@oracle.com>
Sat, 26 Jul 2014 20:03:10 +0000 (16:03 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Sat, 26 Jul 2014 20:03:10 +0000 (16:03 -0400)
commit5eeb88585f444abf58f73e89ab8df77bbeab4fe9
tree6dc8acde1c49d7fe69611f7b58912fc5e0fe7227
parent22302aa32060870767c271a6c8dd0219fffeae6b
e2fsck: fix merge error in "clear uninit flag on directory extents"

In the original patch (against -next), the hunk to fix uninit dirs was
just prior to the hunk labelled "Corrupt but passes checks?".  The
hunks are ordered this way so that if e2fsck obtains permission to fix
a failed-csum extent (which in turn fixes the checksum), it will not
subsequently ask to (re)fix the checksum.

Due to a merge error the hunk moved to the wrong place, so put it
back.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
e2fsck/pass1.c