Skip to contentSkip to conversation

svcrdma: fix printk when memory allocation fails

PATCH In review Jeff Layton 2 participants 3 messages Mar 10, 2014

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 svcrdma: fix printk when memory allocation fails

It retries in 1s, not 1000 jiffies.

---
 net/sunrpc/xprtrdma/svc_rdma_transport.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
net/sunrpc/xprtrdma/svc_rdma_transport.c +1 -2
index 62e4f9bcc387..25688fa2207f 100644
@@ -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;
Signature · 1 line
1.8.5.3
#1 lore raw
Quoted 1 line · Jeff Layton

It retries in 1s, not 1000 jiffies.

Queueing for 3.14, thanks.--b.

Quoted 23 lines
---
 net/sunrpc/xprtrdma/svc_rdma_transport.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
net/sunrpc/xprtrdma/svc_rdma_transport.c +1 -2
index 62e4f9bcc387..25688fa2207f 100644
@@ -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;
Signature · 1 line
1.8.5.3
#2 lore raw
Quoted 4 lines · J. Bruce Fields
Quoted 1 line · Jeff Layton

It retries in 1s, not 1000 jiffies.

Queueing for 3.14, thanks.--b.

(Um, 3.15. I lose track.)

--b.

Quoted 24 lines
Quoted 24 lines
---
 net/sunrpc/xprtrdma/svc_rdma_transport.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
net/sunrpc/xprtrdma/svc_rdma_transport.c +1 -2
index 62e4f9bcc387..25688fa2207f 100644
@@ -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;
Signature · 1 line
1.8.5.3