diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-11-23 19:09:38 +0100 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-12-06 00:30:44 +0100 |
| commit | 5d63360dd8daffc2bc86531e9a44ff9d4881b102 (patch) | |
| tree | 6fdad98cdfbbe3830d8cc3679c435ed8c8be0606 /fs/nfs/callback_xdr.c | |
| parent | NFSv4.1: If slot allocation fails due to OOM, retry more quickly (diff) | |
| download | linux-5d63360dd8daffc2bc86531e9a44ff9d4881b102.tar.xz linux-5d63360dd8daffc2bc86531e9a44ff9d4881b102.zip | |
NFSv4.1: Clean up session draining
Coalesce nfs4_check_drain_bc_complete and nfs4_check_drain_fc_complete
into a single function that can be called when the slot table is known
to be empty, then change nfs4_callback_free_slot() and nfs4_free_slot()
to use it.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/callback_xdr.c')
| -rw-r--r-- | fs/nfs/callback_xdr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c index 81e8c7d4c2e8..ea6a7b190e6b 100644 --- a/fs/nfs/callback_xdr.c +++ b/fs/nfs/callback_xdr.c @@ -762,7 +762,7 @@ static void nfs4_callback_free_slot(struct nfs4_session *session) * A single slot, so highest used slotid is either 0 or -1 */ tbl->highest_used_slotid = NFS4_NO_SLOT; - nfs4_check_drain_bc_complete(session); + nfs4_session_drain_complete(session, tbl); spin_unlock(&tbl->slot_tbl_lock); } |