It seems to like not having any idea any attempt was made to load
it so just try to put it back like the option was never on.
Integrity check other tags besides the filename.
Fix a few logfs that spat out warnings and add a bit more detail
to a couple.
Move a buffer lock to the right spot.
Better aligning macro.
Add a "continue" that should have been there when filename is
seeked over during load.
Change-Id: Ib0c517a7b77d3ba0dd6530ddef19bed62116e4a8
