deferred operations cleanup

[Christoph Hellwig <hch@xxxxxx>]

Hi all,

this series cleans up the deferred operations code by merging a few
methods, and using more type safe types.