diff options
Diffstat (limited to 'net/sunrpc/svc_xprt.c')
-rw-r--r-- | net/sunrpc/svc_xprt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c index b98ee3514912..88f2bf671960 100644 --- a/net/sunrpc/svc_xprt.c +++ b/net/sunrpc/svc_xprt.c | |||
@@ -598,6 +598,7 @@ int svc_recv(struct svc_rqst *rqstp, long timeout) | |||
598 | 598 | ||
599 | /* now allocate needed pages. If we get a failure, sleep briefly */ | 599 | /* now allocate needed pages. If we get a failure, sleep briefly */ |
600 | pages = (serv->sv_max_mesg + PAGE_SIZE) / PAGE_SIZE; | 600 | pages = (serv->sv_max_mesg + PAGE_SIZE) / PAGE_SIZE; |
601 | BUG_ON(pages >= RPCSVC_MAXPAGES); | ||
601 | for (i = 0; i < pages ; i++) | 602 | for (i = 0; i < pages ; i++) |
602 | while (rqstp->rq_pages[i] == NULL) { | 603 | while (rqstp->rq_pages[i] == NULL) { |
603 | struct page *p = alloc_page(GFP_KERNEL); | 604 | struct page *p = alloc_page(GFP_KERNEL); |
@@ -612,7 +613,6 @@ int svc_recv(struct svc_rqst *rqstp, long timeout) | |||
612 | rqstp->rq_pages[i] = p; | 613 | rqstp->rq_pages[i] = p; |
613 | } | 614 | } |
614 | rqstp->rq_pages[i++] = NULL; /* this might be seen in nfs_read_actor */ | 615 | rqstp->rq_pages[i++] = NULL; /* this might be seen in nfs_read_actor */ |
615 | BUG_ON(pages >= RPCSVC_MAXPAGES); | ||
616 | 616 | ||
617 | /* Make arg->head point to first page and arg->pages point to rest */ | 617 | /* Make arg->head point to first page and arg->pages point to rest */ |
618 | arg = &rqstp->rq_arg; | 618 | arg = &rqstp->rq_arg; |
@@ -973,7 +973,7 @@ void svc_close_net(struct svc_serv *serv, struct net *net) | |||
973 | svc_clear_pools(serv, net); | 973 | svc_clear_pools(serv, net); |
974 | /* | 974 | /* |
975 | * At this point the sp_sockets lists will stay empty, since | 975 | * At this point the sp_sockets lists will stay empty, since |
976 | * svc_enqueue will not add new entries without taking the | 976 | * svc_xprt_enqueue will not add new entries without taking the |
977 | * sp_lock and checking XPT_BUSY. | 977 | * sp_lock and checking XPT_BUSY. |
978 | */ | 978 | */ |
979 | svc_clear_list(&serv->sv_tempsocks, net); | 979 | svc_clear_list(&serv->sv_tempsocks, net); |