Ensure that we fix the non-NULL stateid case as well.
Signed-off-by: NTrond Myklebust <trond.myklebust@primarydata.com>