osd: bring FileJournal in sync with giant

- revert an incorrect backport (it was a wip branch/patch)
- backport the series of aio header changes, since they are all dependent and
  fixing each other

I'm not sure what the original problem Loic saw was (that prompted the
backport), but hopefully this series also addresses it...