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>

diff --git a/fs/nfsd/netns.h b/fs/nfsd/netns.h
index 130563210c68d0e99bc23ef7907717072e32ea5a..9047706b3e1018e386537346e22df5c2668ff42b 100644 (file)
--- 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 3e76d281bba839cb482eb8d69093733fc7f3acd2..359793f89493469cb74b567f37b5a5722056b425 100644 (file)
--- 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;
 }