diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-05-29 12:52:16 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-05-29 12:52:16 +0200 |
commit | 8a90bb5116889e98008fbc8178fc2a77bb51df4a (patch) | |
tree | 210b6755c9ae2d0d66a79f8696469ab50b7621ad /fs/nfs/nfs4session.c | |
parent | d47333ddb234dbc661ab2a4fe019758bd33ba33b (diff) | |
parent | 1ab9ecc24819a8cf8ee982aaf6fb83298f094b0d (diff) | |
download | op-kernel-dev-8a90bb5116889e98008fbc8178fc2a77bb51df4a.zip op-kernel-dev-8a90bb5116889e98008fbc8178fc2a77bb51df4a.tar.gz |
Merge tag 'asoc-v3.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.10
A series of driver specific updates, none particularly critical, plus
one fix to the compressed API code to handle capture streams properly
which is very safe for mainline as there's no current users.
Diffstat (limited to 'fs/nfs/nfs4session.c')
-rw-r--r-- | fs/nfs/nfs4session.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/nfs4session.c b/fs/nfs/nfs4session.c index ebda5f4..c4e225e 100644 --- a/fs/nfs/nfs4session.c +++ b/fs/nfs/nfs4session.c @@ -73,7 +73,7 @@ void nfs4_free_slot(struct nfs4_slot_table *tbl, struct nfs4_slot *slot) tbl->highest_used_slotid = new_max; else { tbl->highest_used_slotid = NFS4_NO_SLOT; - nfs4_session_drain_complete(tbl->session, tbl); + nfs4_slot_tbl_drain_complete(tbl); } } dprintk("%s: slotid %u highest_used_slotid %d\n", __func__, @@ -226,7 +226,7 @@ static bool nfs41_assign_slot(struct rpc_task *task, void *pslot) struct nfs4_slot *slot = pslot; struct nfs4_slot_table *tbl = slot->table; - if (nfs4_session_draining(tbl->session) && !args->sa_privileged) + if (nfs4_slot_tbl_draining(tbl) && !args->sa_privileged) return false; slot->generation = tbl->generation; args->sa_slot = slot; |