leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nfsd: make laundromat network namespace aware

Browse Source 
This patch moves laundromat_work to nfsd per-net context, thus allowing to run
multiple laundries.

Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Stanislav Kinsbursky 2012-11-14 18:22:17 +03:00 committed by J. Bruce Fields
parent 12760c6685
commit 0912128149
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfsd/netns.h
View File

@ -79,6 +79,8 @@ struct nfsd_net {
*/ */
struct list_head client_lru; struct list_head client_lru;
struct list_head close_lru; struct list_head close_lru;
struct delayed_work laundromat_work;
}; };
extern int nfsd_net_id; extern int nfsd_net_id;

21
fs/nfsd/nfs4state.c
View File

@ -3176,7 +3176,7 @@ nfsd4_end_grace(struct nfsd_net *nn)
} }
static time_t static time_t
nfs4_laundromat(void) nfs4_laundromat(struct nfsd_net *nn)
{ {
struct nfs4_client *clp; struct nfs4_client *clp;
struct nfs4_openowner *oo; struct nfs4_openowner *oo;
@ -3185,7 +3185,6 @@ nfs4_laundromat(void)
time_t cutoff = get_seconds() - nfsd4_lease; time_t cutoff = get_seconds() - nfsd4_lease;
time_t t, clientid_val = nfsd4_lease; time_t t, clientid_val = nfsd4_lease;
time_t u, test_val = nfsd4_lease; time_t u, test_val = nfsd4_lease;
struct nfsd_net *nn = net_generic(&init_net, nfsd_net_id);
nfs4_lock_state(); nfs4_lock_state();
@ -3251,16 +3250,19 @@ nfs4_laundromat(void)
static struct workqueue_struct *laundry_wq; static struct workqueue_struct *laundry_wq;
static void laundromat_main(struct work_struct *); static void laundromat_main(struct work_struct *);
static DECLARE_DELAYED_WORK(laundromat_work, laundromat_main);
static void static void
laundromat_main(struct work_struct *not_used) laundromat_main(struct work_struct *laundry)
{ {
time_t t; time_t t;
struct delayed_work *dwork = container_of(laundry, struct delayed_work,
work);
struct nfsd_net *nn = container_of(dwork, struct nfsd_net,
laundromat_work);
t = nfs4_laundromat(); t = nfs4_laundromat(nn);
dprintk("NFSD: laundromat_main - sleeping for %ld seconds\n", t); dprintk("NFSD: laundromat_main - sleeping for %ld seconds\n", t);
queue_delayed_work(laundry_wq, &laundromat_work, t*HZ); queue_delayed_work(laundry_wq, &nn->laundromat_work, t*HZ);
} }
static inline __be32 nfs4_check_fh(struct svc_fh *fhp, struct nfs4_ol_stateid *stp) static inline __be32 nfs4_check_fh(struct svc_fh *fhp, struct nfs4_ol_stateid *stp)
@ -4791,6 +4793,8 @@ static int nfs4_state_start_net(struct net *net)
INIT_LIST_HEAD(&nn->client_lru); INIT_LIST_HEAD(&nn->client_lru);
INIT_LIST_HEAD(&nn->close_lru); INIT_LIST_HEAD(&nn->close_lru);
INIT_DELAYED_WORK(&nn->laundromat_work, laundromat_main);
return 0; return 0;
err_sessionid: err_sessionid:
@ -4875,7 +4879,8 @@ nfs4_state_start(void)
ret = nfsd4_create_callback_queue(); ret = nfsd4_create_callback_queue();
if (ret) if (ret)
goto out_free_laundry; goto out_free_laundry;
queue_delayed_work(laundry_wq, &laundromat_work, nfsd4_grace * HZ);
queue_delayed_work(laundry_wq, &nn->laundromat_work, nfsd4_grace * HZ);
set_max_delegations(); set_max_delegations();
return 0; return 0;
out_free_laundry: out_free_laundry:
@ -4918,7 +4923,7 @@ nfs4_state_shutdown(void)
struct net *net = &init_net; struct net *net = &init_net;
struct nfsd_net *nn = net_generic(net, nfsd_net_id); struct nfsd_net *nn = net_generic(net, nfsd_net_id);
cancel_delayed_work_sync(&laundromat_work); cancel_delayed_work_sync(&nn->laundromat_work);
destroy_workqueue(laundry_wq); destroy_workqueue(laundry_wq);
locks_end_grace(&nn->nfsd4_manager); locks_end_grace(&nn->nfsd4_manager);
nfs4_lock_state(); nfs4_lock_state();