23 Feb, 2011
1 commit
-
Fix bug introduced in patch
85a56480 NFSD: Update XDR decoders in NFSv4 callback clientAlthough decode_cb_sequence4resok ignores highest slotid and target highest slotid
it must account for their space in their xdr stream when calling xdr_inline_decodeCc: Chuck Lever
Signed-off-by: Benny Halevy
Signed-off-by: J. Bruce Fields
14 Feb, 2011
1 commit
-
Bugs introduced in 85a56480191ca9f08fc775c129b9eb5c8c1f2c05
"NFSD: Update XDR decoders in NFSv4 callback client"Cc: Chuck Lever
Signed-off-by: Benny Halevy
Signed-off-by: J. Bruce Fields
15 Jan, 2011
2 commits
-
* 'for-2.6.38' of git://linux-nfs.org/~bfields/linux: (62 commits)
nfsd4: fix callback restarting
nfsd: break lease on unlink, link, and rename
nfsd4: break lease on nfsd setattr
nfsd: don't support msnfs export option
nfsd4: initialize cb_per_client
nfsd4: allow restarting callbacks
nfsd4: simplify nfsd4_cb_prepare
nfsd4: give out delegations more quickly in 4.1 case
nfsd4: add helper function to run callbacks
nfsd4: make sure sequence flags are set after destroy_session
nfsd4: re-probe callback on connection loss
nfsd4: set sequence flag when backchannel is down
nfsd4: keep finer-grained callback status
rpc: allow xprt_class->setup to return a preexisting xprt
rpc: keep backchannel xprt as long as server connection
rpc: move sk_bc_xprt to svc_xprt
nfsd4: allow backchannel recovery
nfsd4: support BIND_CONN_TO_SESSION
nfsd4: modify session list under cl_lock
Documentation: fl_mylease no longer exists
...Fix up conflicts in fs/nfsd/vfs.c with the vfs-scale work. The
vfs-scale work touched some msnfs cases, and this merge removes support
for that entirely, so the conflict was trivial to resolve. -
Ensure a new callback is added to the client's list of callbacks at most
once.Signed-off-by: J. Bruce Fields
14 Jan, 2011
1 commit
-
Otherwise a callback that is aborted before it runs will result in a
list_del on an uninitialized list head.Signed-off-by: J. Bruce Fields
12 Jan, 2011
6 commits
-
If we lose the backchannel and then the client repairs the problem,
resend any callbacks.We use a new cb_done flag to track whether there is still work to be
done for the callback or whether it can be destroyed with the rpc.Signed-off-by: J. Bruce Fields
-
Remove handling for a nonexistant case (status && !-EAGAIN).
Signed-off-by: J. Bruce Fields
-
Signed-off-by: J. Bruce Fields
-
If this loses any backchannel, make sure we have a chance to notice that
and set the sequence flags.Signed-off-by: J. Bruce Fields
-
Distinguish between when the callback channel is known to be down, and
when it is not yet confirmed. This will be useful in the 4.1 case.Also, we don't seem to be using the fact that this field is atomic.
Signed-off-by: J. Bruce Fields
-
Now that we have a list of connections to choose from, we can teach the
callback code to just pick a suitable connection and use that, instead
of insisting on forever using the connection that the first
create_session was sent with.Signed-off-by: J. Bruce Fields
05 Jan, 2011
2 commits
-
when callback is generated in NFSv4 server, it doesn't set the source
address. When an alias IP is utilized on NFSv4 server and suppose the
client is accessing via that alias IP (e.g. eth0:0), the client invokes
the callback to the IP address that is set on the original device (e.g.
eth0). This behavior results in timeout of xprt.
The patch sets the IP address that the client should invoke callback to.Signed-off-by: Takuma Umeya
[bfields@redhat.com: Simplify gen_callback arguments, use helper function]
Signed-off-by: J. Bruce Fields -
setup_callback_client(), nfsd4_release_cb() and nfsd4_process_cb_update()
do not have users outside the translation unit. Let's declare it as
static.Signed-off-by: Kirill A. Shutemov
Signed-off-by: J. Bruce Fields
17 Dec, 2010
5 commits
-
Now that all client-side XDR decoder routines use xdr_streams, there
should be no need to support the legacy calling sequence [rpc_rqst *,
__be32 *, RPC res *] anywhere. We can construct an xdr_stream in the
generic RPC code, instead of in each decoder function.This is a refactoring change. It should not cause different behavior.
Signed-off-by: Chuck Lever
Tested-by: J. Bruce Fields
Signed-off-by: Trond Myklebust -
Now that all client-side XDR encoder routines use xdr_streams, there
should be no need to support the legacy calling sequence [rpc_rqst *,
__be32 *, RPC arg *] anywhere. We can construct an xdr_stream in the
generic RPC code, instead of in each encoder function.Also, all the client-side encoder functions return 0 now, making a
return value superfluous. Take this opportunity to convert them to
return void instead.This is a refactoring change. It should not cause different behavior.
Signed-off-by: Chuck Lever
Tested-by: J. Bruce Fields
Signed-off-by: Trond Myklebust -
Clean up.
When I was making other changes in this area, checkscript.pl
complained about the use of leading blanks in the PROC macros in the
xdr files.Signed-off-by: Chuck Lever
Tested-by: J. Bruce Fields
Signed-off-by: Trond Myklebust -
Clean up.
Remove old-style NFSv4 XDR macros in favor of the style now used in
fs/nfs/nfs4xdr.c. These were forgotten during the recent nfs4xdr.c
rewrite.Additional whitespace cleanup adds to the size of this patch.
Signed-off-by: Chuck Lever
Tested-by: J. Bruce Fields
Signed-off-by: Trond Myklebust -
Clean up.
Remove old-style NFSv4 XDR macros in favor of the style now used in
fs/nfs/nfs4xdr.c. These were forgotten during the recent nfs4xdr.c
rewrite.Signed-off-by: Chuck Lever
Tested-by: J. Bruce Fields
Signed-off-by: Trond Myklebust
21 Oct, 2010
6 commits
-
In the sessions backchannel case, we don't need a krb5 principal name
for the client; we use the already-created forechannel credentials
instead.Some cleanup, while we're there: make it clearer which code here is 4.0-
or sessions- specific.Signed-off-by: J. Bruce Fields
-
The minorversion seems more a property of the client than the callback
channel.Some time we should probably also enforce consistent minorversion usage
from the client; for now, this is just a cosmetic change.Signed-off-by: J. Bruce Fields
-
Only one of the nfsd4_callback_probe callers actually cares about
changing the callback information.Signed-off-by: J. Bruce Fields
-
The callback program is allowed to depend on the session which the
callback is going over.No change in behavior yet, while we still only do callbacks over a
single session for the lifetime of the client.Signed-off-by: J. Bruce Fields
-
Currently we don't deal well with a client that has multiple sessions
associated with it (even simultaneously, or serially over the lifetime
of the client).In particular, we don't attempt to keep the backchannel running after
the original session diseappears.We will fix that soon.
Once we do that, we need the slot sequence number to be per-session;
otherwise, for example, we cannot correctly handle a case like this:- All session 1 connections are lost.
- The client creates session 2. We use it for the backchannel
(since it's the only working choice).
- The client gives us a new connection to use with session 1.
- The client destroys session 2.At this point our only choice is to go back to using session 1. When we
do so we must use the sequence number that is next for session 1. We
therefore need to maintain multiple sequence number streams.Signed-off-by: J. Bruce Fields
-
Instead of copying the sessionid, use the new cl_cb_session pointer,
which indicates which session we're using for the backchannel.Signed-off-by: J. Bruce Fields
02 Oct, 2010
8 commits
-
Instead of creating the new rpc client from a regular server thread,
set a flag, kick off a null call, and allow the null call to do the work
of setting up the client on the callback workqueue.Use a spinlock to ensure the callback work gets a consistent view of the
callback parameters.This allows, for example, changing the callback from contexts where
sleeping is not allowed. I hope it will also keep the locking simple as
we add more session and trunking features, by serializing most of the
callback-specific work.This also closes a small race where the the new cb_ident could be used
with an old connection (or vice-versa).Signed-off-by: J. Bruce Fields
-
I don't see the point of the separate struct. It seems to just be
getting in the way.Signed-off-by: J. Bruce Fields
-
This will eventually allow us, for example, to kick off null callback
from contexts where we can't sleep.Signed-off-by: J. Bruce Fields
-
Make the recall callback code more generic, so that other callbacks
will be able to use it too.Signed-off-by: J. Bruce Fields
-
With apologies for the gratuitous rename, the new name seems more
helpful to me.Signed-off-by: J. Bruce Fields
-
These two structs don't really need to be distinct as far as I can tell.
Signed-off-by: J. Bruce Fields
-
Now that we have both nfsd4_callback and nfsd4_cb_conn structures, I get
confused if variables of both types are always named cb....Signed-off-by: J. Bruce Fields
-
Signed-off-by: Pavel Emelyanov
Signed-off-by: J. Bruce Fields
08 Sep, 2010
1 commit
-
Use NFS4_STATEID_SIZE from include/linux/nfs4
Signed-off-by: Andy Adamson
Signed-off-by: J. Bruce Fields
07 Aug, 2010
1 commit
-
If a callback is retried at nfsd4_cb_recall_done() due to
some error, the returned rpc reply crashes here:@@ -514,6 +514,7 @@ decode_cb_sequence(struct xdr_stream *xdr, struct nfsd4_cb_sequence *res,
u32 dummy;
__be32 *p;+ BUG_ON(!res);
if (res->cbs_minorversion == 0)
return 0;[BUG_ON added for demonstration]
This is because the nfsd4_cb_done_sequence() has NULLed out
the task->tk_msg.rpc_resp pointer.Also eventually the rpc would use the new slot without making
sure it is free by calling nfsd41_cb_setup_sequence().This problem was introduced by a 4.1 protocol addition patch:
[0421b5c5] nfsd41: Backchannel: Implement cb_recall over NFSv4.1Which was overlooking the possibility of an RPC callback retries.
For not-4.1 case redoing the _prepare is harmless.Signed-off-by: Boaz Harrosh
Signed-off-by: J. Bruce Fields
25 Jun, 2010
2 commits
-
When the rarely-used callback-connection-changing setclientid occurs
simultaneously with a delegation recall, we rerun the recall by
requeueing it on a workqueue. But we also need to take a reference on
the delegation in that case, since the delegation held by the rpc itself
will be released by the rpc_release callback.Signed-off-by: J. Bruce Fields
-
Signed-off-by: J. Bruce Fields
23 Jun, 2010
1 commit
-
To be used also for the pnfs cb_layoutrecall callback
Signed-off-by: Benny Halevy
[nfsd4: fix cb_recall encoding]
"nfsd: nfs4callback encode_stateid helper function" forgot to reserve
more space after return from the new helper.
Reported-by: Michael Groshans
Signed-off-by: Benny Halevy
Signed-off-by: J. Bruce Fields
01 Jun, 2010
3 commits
-
We don't use this, and probably never will.
Signed-off-by: J. Bruce Fields
-
If a recall fails for some unexpected reason, instead of ignoring it and
treating it like a success, it's safer to treat it as a failure,
preventing further delgation grants and returning CB_PATH_DOWN.Also put put switches in a (two me) more logical order, with normal case
first.Signed-off-by: J. Bruce Fields
-
Since rpc_call_async() guarantees that the release method will be called
even on failure, this put is wrong.Signed-off-by: J. Bruce Fields