Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b25cd058 authored by Weston Andros Adamson's avatar Weston Andros Adamson Committed by Trond Myklebust
Browse files

SUNRPC: remove BUG_ONs checking RPCSVC_MAXPAGES 



Replace two bounds checking BUG_ON() calls with WARN_ON_ONCE() and resetting
the requested size to RPCSVC_MAXPAGES.

Signed-off-by: default avatarWeston Andros Adamson <dros@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent ff1fdb9b

net/sunrpc/svc.c

+3 −1
Original line number Diff line number Diff line
@@ -587,7 +587,9 @@ svc_init_buffer(struct svc_rqst *rqstp, unsigned int size, int node) 
				       * We assume one is at most one page

				       */

	arghi = 0;

	BUG_ON(pages > RPCSVC_MAXPAGES);

	WARN_ON_ONCE(pages > RPCSVC_MAXPAGES);

	if (pages > RPCSVC_MAXPAGES)

		pages = RPCSVC_MAXPAGES;

	while (pages) {

		struct page *p = alloc_pages_node(node, GFP_KERNEL, 0);

		if (!p)

net/sunrpc/svc_xprt.c

+4 −1
Original line number Diff line number Diff line
@@ -579,7 +579,10 @@ int svc_alloc_arg(struct svc_rqst *rqstp) 


	/* now allocate needed pages.  If we get a failure, sleep briefly */

	pages = (serv->sv_max_mesg + PAGE_SIZE) / PAGE_SIZE;

	BUG_ON(pages >= RPCSVC_MAXPAGES);

	WARN_ON_ONCE(pages >= RPCSVC_MAXPAGES);

	if (pages >= RPCSVC_MAXPAGES)

		/* use as many pages as possible */

		pages = RPCSVC_MAXPAGES - 1;

	for (i = 0; i < pages ; i++)

		while (rqstp->rq_pages[i] == NULL) {

			struct page *p = alloc_page(GFP_KERNEL);