diff options
| author | Stanislav Kinsbursky <skinsbursky@parallels.com> | 2012-11-27 14:11:44 +0300 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2012-11-28 10:39:46 -0500 |
| commit | 3d7337115d06f21970e23684f4d2e62e3a44c572 (patch) | |
| tree | 08701fd0025986ff1b0ec6d70022189c000876c3 /fs/nfsd/nfs4callback.c | |
| parent | 864aee5c6f90533984c356494e6b0a8070e5d5f2 (diff) | |
| download | linux-3d7337115d06f21970e23684f4d2e62e3a44c572.tar.gz linux-3d7337115d06f21970e23684f4d2e62e3a44c572.tar.bz2 linux-3d7337115d06f21970e23684f4d2e62e3a44c572.zip | |
nfsd: make NFSv4 lease time per net
Lease time is a part of NFSv4 state engine, which is constructed per network
namespace.
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4callback.c')
| -rw-r--r-- | fs/nfsd/nfs4callback.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index 826cc269c445..99bc85ff0217 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c @@ -36,6 +36,7 @@ #include <linux/slab.h> #include "nfsd.h" #include "state.h" +#include "netns.h" #define NFSDDBG_FACILITY NFSDDBG_PROC @@ -625,9 +626,10 @@ static const struct rpc_program cb_program = { .pipe_dir_name = "nfsd4_cb", }; -static int max_cb_time(void) +static int max_cb_time(struct net *net) { - return max(nfsd4_lease/10, (time_t)1) * HZ; + struct nfsd_net *nn = net_generic(net, nfsd_net_id); + return max(nn->nfsd4_lease/10, (time_t)1) * HZ; } static struct rpc_cred *callback_cred; @@ -659,7 +661,7 @@ static struct rpc_cred *get_backchannel_cred(struct nfs4_client *clp, struct rpc static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *conn, struct nfsd4_session *ses) { struct rpc_timeout timeparms = { - .to_initval = max_cb_time(), + .to_initval = max_cb_time(clp->net), .to_retries = 0, }; struct rpc_create_args args = { |