diff options
author | Andy Adamson <andros@netapp.com> | 2009-04-01 09:22:15 -0400 |
---|---|---|
committer | Benny Halevy <bhalevy@panasas.com> | 2009-06-17 13:46:39 -0400 |
commit | fbcd4abcb3841f85578985c09c6df85aa41b0ae8 (patch) | |
tree | fd1744248ab503dad083e0fb54c938315adef92f /include/linux | |
parent | 510b81756f18922a4c5b555e8145f4fed5beb569 (diff) |
nfs41: setup_sequence method
Allocate a slot in the session slot table and set the sequence op arguments.
Called at the rpc prepare stage.
Add a status to nfs41_sequence_res, initialize it to one so that we catch
rpc level failures which do not go through decode_sequence which sets
the new status field.
Note that upon an rpc level failure, we don't know if the server processed the
sequence operation or not. Proceed as if the server did process the sequence
operation.
Signed-off-by: Rahul Iyer <iyer@netapp.com>
[nfs41: sequence args use slotid]
[nfs41: find slot return slotid]
Signed-off-by: Andy Adamson <andros@netapp.com>
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
[nfs41: remove SEQ4_STATUS_USE_TK_STATUS]
As per 11-14-08 review
[move extern declaration from nfs41: sequence setup/done support]
[removed sa_session definition, changed sa_cache_this into a u8 to reduce footprint]
Signed-off-by: Andy Adamson <andros@netapp.com>
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
[nfs41: rpc_sleep_on slot_tbl_waitq must be called under slot_tbl_lock]
Otherwise there's a race (we've hit) with nfs4_free_slot where
nfs41_setup_sequence sees a full slot table, unlocks slot_tbl_lock,
nfs4_free_slots happen concurrently and call rpc_wake_up_next
where there's nobody to wake up yet, context goes back to
nfs41_setup_sequence which goes to sleep when the slot table
is actually empty now and there's no-one to wake it up anymore.
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/nfs_xdr.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index db0d1236aae7..4ac14b40efc9 100644 --- a/include/linux/nfs_xdr.h +++ b/include/linux/nfs_xdr.h | |||
@@ -163,11 +163,15 @@ struct nfs4_slot { | |||
163 | 163 | ||
164 | struct nfs4_sequence_args { | 164 | struct nfs4_sequence_args { |
165 | struct nfs4_session *sa_session; | 165 | struct nfs4_session *sa_session; |
166 | u8 sa_slotid; | ||
167 | u8 sa_cache_this; | ||
166 | }; | 168 | }; |
167 | 169 | ||
168 | struct nfs4_sequence_res { | 170 | struct nfs4_sequence_res { |
169 | struct nfs4_session *sr_session; | 171 | struct nfs4_session *sr_session; |
170 | u8 sr_slotid; /* slot used to send request */ | 172 | u8 sr_slotid; /* slot used to send request */ |
173 | unsigned long sr_renewal_time; | ||
174 | int sr_status; /* sequence operation status */ | ||
171 | }; | 175 | }; |
172 | 176 | ||
173 | /* | 177 | /* |