Skip to content

Commit

Permalink
nfsd: recovery - make in_grace per net
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stanislav Kinsbursky authored and J. Bruce Fields committed Nov 28, 2012
1 parent 3a07336 commit f141f79
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
1 change: 1 addition & 0 deletions fs/nfsd/netns.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ struct nfsd_net {
spinlock_t client_lock;

struct file *rec_file;
bool in_grace;
};

extern int nfsd_net_id;
Expand Down
9 changes: 4 additions & 5 deletions fs/nfsd/nfs4recover.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -221,7 +220,7 @@ nfsd4_create_clid_dir(struct nfs4_client *clp)
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;
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit f141f79

Please sign in to comment.