OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nfsd: remove redundant boot_time parm from grace_done client tracking op 

Since it's stored in nfsd_net, we don't need to pass it in separately.

Signed-off-by: Jeff Layton <jlayton@primarydata.com>
This commit is contained in:
Jeff Layton 2014-09-12 16:40:20 -04:00 committed by J. Bruce Fields
parent f779002965
commit 919b8049f0
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fs/nfsd/nfs4recover.c
View File

@ -58,7 +58,7 @@ struct nfsd4_client_tracking_ops {
void (*create)(struct nfs4_client *); void (*create)(struct nfs4_client *);
void (*remove)(struct nfs4_client *); void (*remove)(struct nfs4_client *);
int (*check)(struct nfs4_client *); int (*check)(struct nfs4_client *);
void (*grace_done)(struct nfsd_net *, time_t); void (*grace_done)(struct nfsd_net *);
}; };
/* Globals */ /* Globals */
@ -393,7 +393,7 @@ purge_old(struct dentry *parent, struct dentry *child, struct nfsd_net *nn)
} }
static void static void
nfsd4_recdir_purge_old(struct nfsd_net *nn, time_t boot_time) nfsd4_recdir_purge_old(struct nfsd_net *nn)
{ {
int status; int status;
@ -1021,7 +1021,7 @@ nfsd4_cld_check(struct nfs4_client *clp)
} }
static void static void
nfsd4_cld_grace_done(struct nfsd_net *nn, time_t boot_time) nfsd4_cld_grace_done(struct nfsd_net *nn)
{ {
int ret; int ret;
struct cld_upcall *cup; struct cld_upcall *cup;
@ -1034,7 +1034,7 @@ nfsd4_cld_grace_done(struct nfsd_net *nn, time_t boot_time)
} }
cup->cu_msg.cm_cmd = Cld_GraceDone; cup->cu_msg.cm_cmd = Cld_GraceDone;
cup->cu_msg.cm_u.cm_gracetime = (int64_t)boot_time; cup->cu_msg.cm_u.cm_gracetime = (int64_t)nn->boot_time;
ret = cld_pipe_upcall(cn->cn_pipe, &cup->cu_msg); ret = cld_pipe_upcall(cn->cn_pipe, &cup->cu_msg);
if (!ret) if (!ret)
ret = cup->cu_msg.cm_status; ret = cup->cu_msg.cm_status;
@ -1250,13 +1250,12 @@ nfsd4_umh_cltrack_check(struct nfs4_client *clp)
} }
static void static void
nfsd4_umh_cltrack_grace_done(struct nfsd_net __attribute__((unused)) *nn, nfsd4_umh_cltrack_grace_done(struct nfsd_net *nn)
time_t boot_time)
{ {
char *legacy; char *legacy;
char timestr[22]; /* FIXME: better way to determine max size? */ char timestr[22]; /* FIXME: better way to determine max size? */
sprintf(timestr, "%ld", boot_time); sprintf(timestr, "%ld", nn->boot_time);
legacy = nfsd4_cltrack_legacy_topdir(); legacy = nfsd4_cltrack_legacy_topdir();
nfsd4_umh_cltrack_upcall("gracedone", timestr, legacy); nfsd4_umh_cltrack_upcall("gracedone", timestr, legacy);
kfree(legacy); kfree(legacy);
@ -1361,10 +1360,10 @@ nfsd4_client_record_check(struct nfs4_client *clp)
} }
void void
nfsd4_record_grace_done(struct nfsd_net *nn, time_t boot_time) nfsd4_record_grace_done(struct nfsd_net *nn)
{ {
if (nn->client_tracking_ops) if (nn->client_tracking_ops)
nn->client_tracking_ops->grace_done(nn, boot_time); nn->client_tracking_ops->grace_done(nn);
} }
static int static int

2
fs/nfsd/nfs4state.c
View File

@ -4122,7 +4122,7 @@ nfsd4_end_grace(struct nfsd_net *nn)
dprintk("NFSD: end of grace period\n"); dprintk("NFSD: end of grace period\n");
nn->grace_ended = true; nn->grace_ended = true;
nfsd4_record_grace_done(nn, nn->boot_time); nfsd4_record_grace_done(nn);
locks_end_grace(&nn->nfsd4_manager); locks_end_grace(&nn->nfsd4_manager);
/* /*
* Now that every NFSv4 client has had the chance to recover and * Now that every NFSv4 client has had the chance to recover and

2
fs/nfsd/state.h
View File

@ -551,7 +551,7 @@ extern void nfsd4_client_tracking_exit(struct net *net);
extern void nfsd4_client_record_create(struct nfs4_client *clp); extern void nfsd4_client_record_create(struct nfs4_client *clp);
extern void nfsd4_client_record_remove(struct nfs4_client *clp); extern void nfsd4_client_record_remove(struct nfs4_client *clp);
extern int nfsd4_client_record_check(struct nfs4_client *clp); extern int nfsd4_client_record_check(struct nfs4_client *clp);
extern void nfsd4_record_grace_done(struct nfsd_net *nn, time_t boot_time); extern void nfsd4_record_grace_done(struct nfsd_net *nn);
/* nfs fault injection functions */ /* nfs fault injection functions */
#ifdef CONFIG_NFSD_FAULT_INJECTION #ifdef CONFIG_NFSD_FAULT_INJECTION