Skip to contentSkip to conversation

nfsd: do_probe_callback should not clear rpc stats

PATCH Applied Benny Halevy 2 participants 2 messages Sep 26, 2008 – Sep 27, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nfsd: do_probe_callback should not clear rpc stats

Now that cb_stats are static (since commit
ff7d9756b501744540be65e172d27ee321d86103)
there's no need to clear them.

Initially I thought it might make sense to do that every callback probing but since the stats are per-program and they are shared between possibly several client callback instances, zeroing them out seems like the wrong thing to do.

Note that that commit also introduced a bug since stats.program is also being cleared in the process and it is not restored after the memset as it used to be.

---
 fs/nfsd/nfs4callback.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
fs/nfsd/nfs4callback.c +0 -3
index 5e95909..7b94701 100644
@@ -399,9 +399,6 @@ static int do_probe_callback(void *data)
 		__func__, args.program->name, args.program->number,
 		args.program->nrvers, args.version);
 
-	/* Initialize rpc_stat */
-	memset(args.program->stats, 0, sizeof(struct rpc_stat));
-
 	/* Create RPC client */
 	client = rpc_create(&args);
 	if (IS_ERR(client)) {
#1 lore raw
Quoted 10 lines · Benny Halevy

Now that cb_stats are static (since commit
ff7d9756b501744540be65e172d27ee321d86103)
there's no need to clear them.

Initially I thought it might make sense to do that every callback probing but since the stats are per-program and they are shared between possibly several client callback instances, zeroing them out seems like the wrong thing to do.

Quoted 3 lines

Note that that commit also introduced a bug since stats.program is also being cleared in the process and it is not restored after the memset as it used to be.

Thanks applied.--b.

Quoted 21 lines
---
 fs/nfsd/nfs4callback.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
fs/nfsd/nfs4callback.c +0 -3
index 5e95909..7b94701 100644
@@ -399,9 +399,6 @@ static int do_probe_callback(void *data)
 		__func__, args.program->name, args.program->number,
 		args.program->nrvers, args.version);
 
-	/* Initialize rpc_stat */
-	memset(args.program->stats, 0, sizeof(struct rpc_stat));
-
 	/* Create RPC client */
 	client = rpc_create(&args);
 	if (IS_ERR(client)) {