Re: [PATCH 2/3] SUNRPC: have svc_recv() check kthread_should_stop()

["J. Bruce Fields" <bfields@fieldses.org>]

Another nit:

On Thu, Feb 07, 2008 at 04:34:54PM -0500, Jeff Layton wrote:
> diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
> index ea377e0..a3165a2 100644
> --- a/net/sunrpc/svc_xprt.c
> +++ b/net/sunrpc/svc_xprt.c
> @@ -18,6 +18,7 @@
>  #include <linux/skbuff.h>
>  #include <linux/file.h>
>  #include <linux/freezer.h>
> +#include <linux/kthread.h>
>  #include <net/sock.h>
>  #include <net/checksum.h>
>  #include <net/ip.h>
> @@ -586,6 +587,8 @@ int svc_recv(struct svc_rqst *rqstp, long timeout)
>  		while (rqstp->rq_pages[i] == NULL) {
>  			struct page *p = alloc_page(GFP_KERNEL);
>  			if (!p) {
> +				if (kthread_should_stop())
> +					return -EINTR;
>  				int j = msecs_to_jiffies(500);
>  				schedule_timeout_uninterruptible(j);
>  			}

The compiler's whining about the mixed declarations and code, so I've
also done the following in my copy.

--b.

diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
index a3165a2..53c8ea9 100644
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@ -587,9 +587,9 @@ int svc_recv(struct svc_rqst *rqstp, long timeout)
 		while (rqstp->rq_pages[i] == NULL) {
 			struct page *p = alloc_page(GFP_KERNEL);
 			if (!p) {
+				int j = msecs_to_jiffies(500);
 				if (kthread_should_stop())
 					return -EINTR;
-				int j = msecs_to_jiffies(500);
 				schedule_timeout_uninterruptible(j);
 			}
 			rqstp->rq_pages[i] = p;