Attachment 302630 Details for Bug 404831 – kernel patch for verification

[patch] kernel patch for verification

rpc-stats-overflow.patch (text/plain), 8.30 KB, created by Jeff Layton on 2008-04-16 16:07:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2008-04-16 16:07:24 UTC

Size: 8.30 KB

patch

obsolete

>diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
>index 908b23f..4a0b6aa 100644
>--- a/fs/lockd/mon.c
>+++ b/fs/lockd/mon.c
>@@ -235,6 +235,7 @@ static struct rpc_procinfo	nsm_procedures[] = {
> 		.p_replen	= SM_monres_sz,
> 		.p_statidx	= SM_MON,
> 		.p_name		= "MONITOR",
>+		.p_count	= 2147483649,
> 	},
> [SM_UNMON] = {
> 		.p_proc		= SM_UNMON,
>@@ -244,6 +245,7 @@ static struct rpc_procinfo	nsm_procedures[] = {
> 		.p_replen	= SM_unmonres_sz,
> 		.p_statidx	= SM_UNMON,
> 		.p_name		= "UNMONITOR",
>+		.p_count	= 2147483649,
> 	},
> };
> 
>diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c
>index 385437e..62621ee 100644
>--- a/fs/lockd/svc4proc.c
>+++ b/fs/lockd/svc4proc.c
>@@ -497,6 +497,7 @@ struct nlm_void			{ int dummy; };
>    .pc_argsize	= sizeof(struct nlm_##argt),		\
>    .pc_ressize	= sizeof(struct nlm_##rest),		\
>    .pc_xdrressize = respsize,				\
>+   .pc_count	= 2147483649,				\
>  }
> #define	Ck	(1+XDR_QUADLEN(NLM_MAXCOOKIELEN))	/* cookie */
> #define	No	(1+1024/4)				/* netobj */
>diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c
>index 88379cc..0d017a3 100644
>--- a/fs/lockd/svcproc.c
>+++ b/fs/lockd/svcproc.c
>@@ -528,6 +528,7 @@ struct nlm_void			{ int dummy; };
>    .pc_argsize	= sizeof(struct nlm_##argt),		\
>    .pc_ressize	= sizeof(struct nlm_##rest),		\
>    .pc_xdrressize = respsize,				\
>+   .pc_count	= 2147483649,				\
>  }
> 
> #define	Ck	(1+XDR_QUADLEN(NLM_MAXCOOKIELEN))	/* cookie */
>diff --git a/fs/lockd/xdr.c b/fs/lockd/xdr.c
>index 3e459e1..0c9829b 100644
>--- a/fs/lockd/xdr.c
>+++ b/fs/lockd/xdr.c
>@@ -548,6 +548,7 @@ nlmclt_decode_res(struct rpc_rqst *req, __be32 *p, struct nlm_res *resp)
> 	.p_replen    = NLM_##restype##_sz,				\
> 	.p_statidx   = NLMPROC_##proc,					\
> 	.p_name      = #proc,						\
>+	.p_count     = 2147483649,					\
> 	}
> 
> static struct rpc_procinfo	nlm_procedures[] = {
>diff --git a/fs/lockd/xdr4.c b/fs/lockd/xdr4.c
>index 43ff939..7d5e201 100644
>--- a/fs/lockd/xdr4.c
>+++ b/fs/lockd/xdr4.c
>@@ -560,6 +560,7 @@ nlm4clt_decode_res(struct rpc_rqst *req, __be32 *p, struct nlm_res *resp)
> 	.p_replen    = NLM4_##restype##_sz,				\
> 	.p_statidx   = NLMPROC_##proc,					\
> 	.p_name      = #proc,						\
>+	.p_count     = 2147483649,					\
> 	}
> 
> static struct rpc_procinfo	nlm4_procedures[] = {
>diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
>index 13619d2..bca9d8d 100644
>--- a/fs/nfs/callback_xdr.c
>+++ b/fs/nfs/callback_xdr.c
>@@ -464,6 +464,7 @@ static struct svc_procedure nfs4_callback_procedures1[] = {
> 		.pc_decode = (kxdrproc_t)nfs4_decode_void,
> 		.pc_encode = (kxdrproc_t)nfs4_encode_void,
> 		.pc_xdrressize = 1,
>+		.pc_count = 2147483649,
> 	},
> 	[CB_COMPOUND] = {
> 		.pc_func = nfs4_callback_compound,
>@@ -471,6 +472,7 @@ static struct svc_procedure nfs4_callback_procedures1[] = {
> 		.pc_argsize = 256,
> 		.pc_ressize = 256,
> 		.pc_xdrressize = NFS4_CALLBACK_BUFSIZE,
>+		.pc_count = 2147483649,
> 	}
> };
> 
>diff --git a/fs/nfs/mount_clnt.c b/fs/nfs/mount_clnt.c
>index 49c7cd0..bfbac3a 100644
>--- a/fs/nfs/mount_clnt.c
>+++ b/fs/nfs/mount_clnt.c
>@@ -155,6 +155,7 @@ static struct rpc_procinfo mnt_procedures[] = {
> 		.p_replen	= MNT_fhstatus_sz,
> 		.p_statidx	= MNTPROC_MNT,
> 		.p_name		= "MOUNT",
>+		.p_count	= 2147483649,
> 	},
> };
> 
>@@ -167,6 +168,7 @@ static struct rpc_procinfo mnt3_procedures[] = {
> 		.p_replen	= MNT_fhstatus3_sz,
> 		.p_statidx	= MOUNTPROC3_MNT,
> 		.p_name		= "MOUNT",
>+		.p_count	= 2147483649,
> 	},
> };
> 
>diff --git a/fs/nfs/nfs2xdr.c b/fs/nfs/nfs2xdr.c
>index 1f7ea67..19b142e 100644
>--- a/fs/nfs/nfs2xdr.c
>+++ b/fs/nfs/nfs2xdr.c
>@@ -715,6 +715,7 @@ nfs_stat_to_errno(int stat)
> 	.p_timer    =  timer,						\
> 	.p_statidx  =  NFSPROC_##proc,					\
> 	.p_name     =  #proc,						\
>+	.p_count    =  2147483649,					\
> 	}
> struct rpc_procinfo	nfs_procedures[] = {
>     PROC(GETATTR,	fhandle,	attrstat, 1),
>diff --git a/fs/nfs/nfs3xdr.c b/fs/nfs/nfs3xdr.c
>index 3917e2f..b7554b2 100644
>--- a/fs/nfs/nfs3xdr.c
>+++ b/fs/nfs/nfs3xdr.c
>@@ -1138,6 +1138,7 @@ nfs3_xdr_setaclres(struct rpc_rqst *req, __be32 *p, struct nfs_fattr *fattr)
> 	.p_timer     = timer,						\
> 	.p_statidx   = NFS3PROC_##proc,					\
> 	.p_name      = #proc,						\
>+	.p_count     = 2147483649,					\
> 	}
> 
> struct rpc_procinfo	nfs3_procedures[] = {
>@@ -1180,6 +1181,7 @@ static struct rpc_procinfo	nfs3_acl_procedures[] = {
> 		.p_replen = ACL3_getaclres_sz,
> 		.p_timer = 1,
> 		.p_name = "GETACL",
>+		.p_count = 2147483649,
> 	},
> 	[ACLPROC3_SETACL] = {
> 		.p_proc = ACLPROC3_SETACL,
>@@ -1189,6 +1191,7 @@ static struct rpc_procinfo	nfs3_acl_procedures[] = {
> 		.p_replen = ACL3_setaclres_sz,
> 		.p_timer = 0,
> 		.p_name = "SETACL",
>+		.p_count = 2147483649,
> 	},
> };
> 
>diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
>index db1ed9c..987d350 100644
>--- a/fs/nfs/nfs4xdr.c
>+++ b/fs/nfs/nfs4xdr.c
>@@ -4682,6 +4682,7 @@ nfs4_stat_to_errno(int stat)
> 	.p_replen = NFS4_##restype##_sz,			\
> 	.p_statidx = NFSPROC4_CLNT_##proc,			\
> 	.p_name   = #proc,					\
>+	.p_count  = 2147483649,					\
>     }
> 
> struct rpc_procinfo	nfs4_procedures[] = {
>diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c
>index 1c3b765..d2fcced 100644
>--- a/fs/nfsd/nfs2acl.c
>+++ b/fs/nfsd/nfs2acl.c
>@@ -321,7 +321,7 @@ struct nfsd3_voidargs { int dummy; };
>    (kxdrproc_t) nfsaclsvc_release_##relt,		\
>    sizeof(struct nfsd3_##argt##args),		\
>    sizeof(struct nfsd3_##rest##res),		\
>-   0,						\
>+   2147483649,					\
>    cache,					\
>    respsize,					\
>  }
>diff --git a/fs/nfsd/nfs3acl.c b/fs/nfsd/nfs3acl.c
>index b647f2f..b91c547 100644
>--- a/fs/nfsd/nfs3acl.c
>+++ b/fs/nfsd/nfs3acl.c
>@@ -241,7 +241,7 @@ struct nfsd3_voidargs { int dummy; };
>    (kxdrproc_t) nfs3svc_release_##relt,		\
>    sizeof(struct nfsd3_##argt##args),		\
>    sizeof(struct nfsd3_##rest##res),		\
>-   0,						\
>+   2147483649,					\
>    cache,					\
>    respsize,					\
>  }
>diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c
>index c721a1e..3955925 100644
>--- a/fs/nfsd/nfs3proc.c
>+++ b/fs/nfsd/nfs3proc.c
>@@ -670,7 +670,7 @@ struct nfsd3_voidargs { int dummy; };
>    (kxdrproc_t) nfs3svc_release_##relt,		\
>    sizeof(struct nfsd3_##argt##args),		\
>    sizeof(struct nfsd3_##rest##res),		\
>-   0,						\
>+   2147483649,					\
>    cache,					\
>    respsize,					\
>  }
>diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
>index 562abf3..5e17adc 100644
>--- a/fs/nfsd/nfs4callback.c
>+++ b/fs/nfsd/nfs4callback.c
>@@ -326,6 +326,7 @@ out:
>         .p_replen = NFS4_##restype##_sz,                                \
>         .p_statidx = NFSPROC4_CB_##call,				\
> 	.p_name   = #proc,                                              \
>+	.p_count = 2147483649,						\
> }
> 
> static struct rpc_procinfo     nfs4_cb_procedures[] = {
>diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
>index c593db0..adcfdb7 100644
>--- a/fs/nfsd/nfs4proc.c
>+++ b/fs/nfsd/nfs4proc.c
>@@ -1080,7 +1080,7 @@ struct nfsd4_voidargs { int dummy; };
>    (kxdrproc_t) nfs4svc_release_##relt,		\
>    sizeof(struct nfsd4_##argt##args),		\
>    sizeof(struct nfsd4_##rest##res),		\
>-   0,						\
>+   2147483649,					\
>    cache,					\
>    respsize,					\
>  }
>diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c
>index 6cfc96a..b4264ee 100644
>--- a/fs/nfsd/nfsproc.c
>+++ b/fs/nfsd/nfsproc.c
>@@ -541,7 +541,7 @@ struct nfsd_void { int dummy; };
>    (kxdrproc_t) nfssvc_release_##relt,		\
>    sizeof(struct nfsd_##argt),			\
>    sizeof(struct nfsd_##rest),			\
>-   0,						\
>+   2147483649,					\
>    cache,					\
>    respsize,				       	\
>  }
>diff --git a/fs/nfsd/stats.c b/fs/nfsd/stats.c
>index 71944cd..149257a 100644
>--- a/fs/nfsd/stats.c
>+++ b/fs/nfsd/stats.c
>@@ -101,7 +101,11 @@ static const struct file_operations nfsd_proc_fops = {
> void
> nfsd_stat_init(void)
> {
>+	int i;
>+
> 	svc_proc_register(&nfsd_svcstats, &nfsd_proc_fops);
>+	for (i = 0; i <= LAST_NFS4_OP; i++)
>+		nfsdstats.nfs4_opcount[i] = 2147483649;
> }
> 
> void
>diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
>index 8c6a7f1..4b1e0f5 100644
>--- a/net/sunrpc/clnt.c
>+++ b/net/sunrpc/clnt.c
>@@ -1480,6 +1480,7 @@ static int rpcproc_decode_null(void *rqstp, __be32 *data, void *obj)
> static struct rpc_procinfo rpcproc_null = {
> 	.p_encode = rpcproc_encode_null,
> 	.p_decode = rpcproc_decode_null,
>+	.p_count = 2147483649,
> };
> 
> static int rpc_ping(struct rpc_clnt *clnt, int flags)
>diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
>index 3164a08..dfcd017 100644
>--- a/net/sunrpc/rpcb_clnt.c
>+++ b/net/sunrpc/rpcb_clnt.c
>@@ -563,6 +563,7 @@ out_err:
> 		.p_statidx	= RPCBPROC_##proc,			\
> 		.p_timer	= 0,					\
> 		.p_name		= #proc,				\
>+		.p_count	= 2147483649,				\
> 	}
> 
> /*

Actions: View | Diff

Attachments on bug 404831: 273161 | 302629 | 302630 | 302638