Cleanup in preparation for making OPEN calls interruptible by the user.
Signed-off-by: NTrond Myklebust <Trond.Myklebust@netapp.com>