summaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorStanislav Kinsbursky <skinsbursky@parallels.com>2012-11-26 16:16:30 +0300
committerJ. Bruce Fields <bfields@redhat.com>2012-11-28 10:13:54 -0500
commitf141f79d709de447c8c92ba54821740ae53a5d07 (patch)
treeba95be5f9ebb6c532727c7b0acb169be41da6ef0 /fs/nfsd
parent3a0733692f6665a28c50ebadb6d9db2b183bcb91 (diff)
downloadlinux-f141f79d709de447c8c92ba54821740ae53a5d07.tar.bz2
nfsd: recovery - make in_grace per net
Flag in_grace is a part of client tracking state, which is network namesapce aware. So let'a replace global static variable with per-net one. Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/netns.h1
-rw-r--r--fs/nfsd/nfs4recover.c9
2 files changed, 5 insertions, 5 deletions
diff --git a/fs/nfsd/netns.h b/fs/nfsd/netns.h
index 130563210c68..9047706b3e10 100644
--- a/fs/nfsd/netns.h
+++ b/fs/nfsd/netns.h
@@ -86,6 +86,7 @@ struct nfsd_net {
spinlock_t client_lock;
struct file *rec_file;
+ bool in_grace;
};
extern int nfsd_net_id;
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index 3e76d281bba8..359793f89493 100644
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -64,7 +64,6 @@ struct nfsd4_client_tracking_ops {
/* Globals */
static char user_recovery_dirname[PATH_MAX] = "/var/lib/nfs/v4recovery";
static struct nfsd4_client_tracking_ops *client_tracking_ops;
-static bool in_grace;
static int
nfs4_save_creds(const struct cred **original_creds)
@@ -221,7 +220,7 @@ out_put:
out_unlock:
mutex_unlock(&dir->d_inode->i_mutex);
if (status == 0) {
- if (in_grace) {
+ if (nn->in_grace) {
crp = nfs4_client_to_reclaim(dname, nn);
if (crp)
crp->cr_clp = clp;
@@ -358,7 +357,7 @@ nfsd4_remove_clid_dir(struct nfs4_client *clp)
nfs4_reset_creds(original_cred);
if (status == 0) {
vfs_fsync(nn->rec_file, 0);
- if (in_grace) {
+ if (nn->in_grace) {
/* remove reclaim record */
crp = nfsd4_find_reclaim_client(dname, nn);
if (crp)
@@ -394,7 +393,7 @@ nfsd4_recdir_purge_old(struct nfsd_net *nn, time_t boot_time)
{
int status;
- in_grace = false;
+ nn->in_grace = false;
if (!nn->rec_file)
return;
status = mnt_want_write_file(nn->rec_file);
@@ -473,7 +472,7 @@ nfsd4_init_recdir(struct net *net)
nfs4_reset_creds(original_cred);
if (!status)
- in_grace = true;
+ nn->in_grace = true;
return status;
}