2014-03-10 15:33:55

by Jeff Layton

Subject: [PATCH] svcrdma: fix printk when memory allocation fails

It retries in 1s, not 1000 jiffies.

Signed-off-by: Jeff Layton <[email protected]>
---
net/sunrpc/xprtrdma/svc_rdma_transport.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
index 62e4f9bcc387..25688fa2207f 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
@@ -477,8 +477,7 @@ struct page *svc_rdma_get_page(void)

while ((page = alloc_page(GFP_KERNEL)) == NULL) {
/* If we can't get memory, wait a bit and try again */
- printk(KERN_INFO "svcrdma: out of memory...retrying in 1000 "
- "jiffies.\n");
+ printk(KERN_INFO "svcrdma: out of memory...retrying in 1s\n");
schedule_timeout_uninterruptible(msecs_to_jiffies(1000));
}
return page;
--
1.8.5.3

2014-03-10 18:30:25

by J. Bruce Fields

Subject: Re: [PATCH] svcrdma: fix printk when memory allocation fails

On Mon, Mar 10, 2014 at 11:33:48AM -0400, Jeff Layton wrote:
> It retries in 1s, not 1000 jiffies.

Queueing for 3.14, thanks.--b.

>
> Signed-off-by: Jeff Layton <[email protected]>
> ---
> net/sunrpc/xprtrdma/svc_rdma_transport.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
> index 62e4f9bcc387..25688fa2207f 100644
> --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
> +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
> @@ -477,8 +477,7 @@ struct page *svc_rdma_get_page(void)
>
> while ((page = alloc_page(GFP_KERNEL)) == NULL) {
> /* If we can't get memory, wait a bit and try again */
> - printk(KERN_INFO "svcrdma: out of memory...retrying in 1000 "
> - "jiffies.\n");
> + printk(KERN_INFO "svcrdma: out of memory...retrying in 1s\n");
> schedule_timeout_uninterruptible(msecs_to_jiffies(1000));
> }
> return page;
> --
> 1.8.5.3
>

2014-03-10 18:30:53

by J. Bruce Fields

Subject: Re: [PATCH] svcrdma: fix printk when memory allocation fails

On Mon, Mar 10, 2014 at 02:30:24PM -0400, J. Bruce Fields wrote:
> On Mon, Mar 10, 2014 at 11:33:48AM -0400, Jeff Layton wrote:
> > It retries in 1s, not 1000 jiffies.
>
> Queueing for 3.14, thanks.--b.

(Um, 3.15. I lose track.)

--b.

>
> >
> > Signed-off-by: Jeff Layton <[email protected]>
> > ---
> > net/sunrpc/xprtrdma/svc_rdma_transport.c | 3 +--
> > 1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
> > index 62e4f9bcc387..25688fa2207f 100644
> > --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
> > +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
> > @@ -477,8 +477,7 @@ struct page *svc_rdma_get_page(void)
> >
> > while ((page = alloc_page(GFP_KERNEL)) == NULL) {
> > /* If we can't get memory, wait a bit and try again */
> > - printk(KERN_INFO "svcrdma: out of memory...retrying in 1000 "
> > - "jiffies.\n");
> > + printk(KERN_INFO "svcrdma: out of memory...retrying in 1s\n");
> > schedule_timeout_uninterruptible(msecs_to_jiffies(1000));
> > }
> > return page;
> > --
> > 1.8.5.3
> >