...and move some code around in order to clear out an unnecessary
forward declaration.
Signed-off-by: NTrond Myklebust <Trond.Myklebust@netapp.com>