am 9d965309: (-s ours) Merge "e2fsck: remove unneeded type redefinitions"

* commit '9d9653095dd3ecb9f86e9347a14f7203f52f3f3e':
  e2fsck: remove unneeded type redefinitions