summaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4state.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2007-06-11 23:05:07 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-07-10 23:40:24 -0400
commitb39e625b6e75aa70e26c13f9378756bb5f2af032 (patch)
treeacf17b925b359b051f476c7e9500c4f4d60f5d0c /fs/nfs/nfs4state.c
parent4a35bd41aff5714deb41c8f14766df3871e2e8f7 (diff)
downloadop-kernel-dev-b39e625b6e75aa70e26c13f9378756bb5f2af032.zip
op-kernel-dev-b39e625b6e75aa70e26c13f9378756bb5f2af032.tar.gz
NFSv4: Clean up nfs4_call_async()
Use rpc_run_task() instead of doing it ourselves. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4state.c')
-rw-r--r--fs/nfs/nfs4state.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index a85138e..5d7ffbf 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -375,10 +375,11 @@ void nfs4_close_state(struct path *path, struct nfs4_state *state, mode_t mode)
spin_unlock(&inode->i_lock);
spin_unlock(&owner->so_lock);
- if (oldstate != newstate && nfs4_do_close(path, state) == 0)
- return;
- nfs4_put_open_state(state);
- nfs4_put_state_owner(owner);
+ if (oldstate == newstate) {
+ nfs4_put_open_state(state);
+ nfs4_put_state_owner(owner);
+ } else
+ nfs4_do_close(path, state);
}
/*
OpenPOWER on IntegriCloud