aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAndy Grover <andy.grover@oracle.com>2010-06-23 21:06:30 -0400
committerAndy Grover <andy.grover@oracle.com>2010-09-08 21:16:31 -0400
commitb6fb0df12db6c8b6bbcc7b5c9459b3bbf5f0cee6 (patch)
tree68729d0227028abc94abf9ab748dda3074bac244 /net
parentfbf4d7e3d03587a983ee4e536251ea6c1c848ec2 (diff)
RDS/IB: Make ib_recv_refill return void
Signed-off-by: Andy Grover <andy.grover@oracle.com>
Diffstat (limited to 'net')
-rw-r--r--net/rds/ib.h2
-rw-r--r--net/rds/ib_recv.c6
2 files changed, 2 insertions, 6 deletions
diff --git a/net/rds/ib.h b/net/rds/ib.h
index d2dd23d5c1a0..6265ada08959 100644
--- a/net/rds/ib.h
+++ b/net/rds/ib.h
@@ -323,7 +323,7 @@ void rds_ib_recv_exit(void);
323int rds_ib_recv(struct rds_connection *conn); 323int rds_ib_recv(struct rds_connection *conn);
324int rds_ib_recv_alloc_caches(struct rds_ib_connection *ic); 324int rds_ib_recv_alloc_caches(struct rds_ib_connection *ic);
325void rds_ib_recv_free_caches(struct rds_ib_connection *ic); 325void rds_ib_recv_free_caches(struct rds_ib_connection *ic);
326int rds_ib_recv_refill(struct rds_connection *conn, int prefill); 326void rds_ib_recv_refill(struct rds_connection *conn, int prefill);
327void rds_ib_inc_free(struct rds_incoming *inc); 327void rds_ib_inc_free(struct rds_incoming *inc);
328int rds_ib_inc_copy_to_user(struct rds_incoming *inc, struct iovec *iov, 328int rds_ib_inc_copy_to_user(struct rds_incoming *inc, struct iovec *iov,
329 size_t size); 329 size_t size);
diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c
index 1add097fe198..c8c60981cf2e 100644
--- a/net/rds/ib_recv.c
+++ b/net/rds/ib_recv.c
@@ -353,7 +353,7 @@ out:
353 * 353 *
354 * -1 is returned if posting fails due to temporary resource exhaustion. 354 * -1 is returned if posting fails due to temporary resource exhaustion.
355 */ 355 */
356int rds_ib_recv_refill(struct rds_connection *conn, int prefill) 356void rds_ib_recv_refill(struct rds_connection *conn, int prefill)
357{ 357{
358 struct rds_ib_connection *ic = conn->c_transport_data; 358 struct rds_ib_connection *ic = conn->c_transport_data;
359 struct rds_ib_recv_work *recv; 359 struct rds_ib_recv_work *recv;
@@ -367,14 +367,12 @@ int rds_ib_recv_refill(struct rds_connection *conn, int prefill)
367 if (pos >= ic->i_recv_ring.w_nr) { 367 if (pos >= ic->i_recv_ring.w_nr) {
368 printk(KERN_NOTICE "Argh - ring alloc returned pos=%u\n", 368 printk(KERN_NOTICE "Argh - ring alloc returned pos=%u\n",
369 pos); 369 pos);
370 ret = -EINVAL;
371 break; 370 break;
372 } 371 }
373 372
374 recv = &ic->i_recvs[pos]; 373 recv = &ic->i_recvs[pos];
375 ret = rds_ib_recv_refill_one(conn, recv, prefill); 374 ret = rds_ib_recv_refill_one(conn, recv, prefill);
376 if (ret) { 375 if (ret) {
377 ret = -1;
378 break; 376 break;
379 } 377 }
380 378
@@ -388,7 +386,6 @@ int rds_ib_recv_refill(struct rds_connection *conn, int prefill)
388 "%pI4 returned %d, disconnecting and " 386 "%pI4 returned %d, disconnecting and "
389 "reconnecting\n", &conn->c_faddr, 387 "reconnecting\n", &conn->c_faddr,
390 ret); 388 ret);
391 ret = -1;
392 break; 389 break;
393 } 390 }
394 391
@@ -401,7 +398,6 @@ int rds_ib_recv_refill(struct rds_connection *conn, int prefill)
401 398
402 if (ret) 399 if (ret)
403 rds_ib_ring_unalloc(&ic->i_recv_ring, 1); 400 rds_ib_ring_unalloc(&ic->i_recv_ring, 1);
404 return ret;
405} 401}
406 402
407/* 403/*