Skip to content

Commit

Permalink
RDS/IB: Make ib_recv_refill return void
Browse files Browse the repository at this point in the history
Signed-off-by: Andy Grover <andy.grover@oracle.com>
  • Loading branch information
Andy Grover committed Sep 9, 2010
1 parent fbf4d7e commit b6fb0df
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion net/rds/ib.h
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ void rds_ib_recv_exit(void);
int rds_ib_recv(struct rds_connection *conn);
int rds_ib_recv_alloc_caches(struct rds_ib_connection *ic);
void rds_ib_recv_free_caches(struct rds_ib_connection *ic);
int rds_ib_recv_refill(struct rds_connection *conn, int prefill);
void rds_ib_recv_refill(struct rds_connection *conn, int prefill);
void rds_ib_inc_free(struct rds_incoming *inc);
int rds_ib_inc_copy_to_user(struct rds_incoming *inc, struct iovec *iov,
size_t size);
Expand Down
6 changes: 1 addition & 5 deletions net/rds/ib_recv.c
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ static int rds_ib_recv_refill_one(struct rds_connection *conn,
*
* -1 is returned if posting fails due to temporary resource exhaustion.
*/
int rds_ib_recv_refill(struct rds_connection *conn, int prefill)
void rds_ib_recv_refill(struct rds_connection *conn, int prefill)
{
struct rds_ib_connection *ic = conn->c_transport_data;
struct rds_ib_recv_work *recv;
Expand All @@ -367,14 +367,12 @@ int rds_ib_recv_refill(struct rds_connection *conn, int prefill)
if (pos >= ic->i_recv_ring.w_nr) {
printk(KERN_NOTICE "Argh - ring alloc returned pos=%u\n",
pos);
ret = -EINVAL;
break;
}

recv = &ic->i_recvs[pos];
ret = rds_ib_recv_refill_one(conn, recv, prefill);
if (ret) {
ret = -1;
break;
}

Expand All @@ -388,7 +386,6 @@ int rds_ib_recv_refill(struct rds_connection *conn, int prefill)
"%pI4 returned %d, disconnecting and "
"reconnecting\n", &conn->c_faddr,
ret);
ret = -1;
break;
}

Expand All @@ -401,7 +398,6 @@ int rds_ib_recv_refill(struct rds_connection *conn, int prefill)

if (ret)
rds_ib_ring_unalloc(&ic->i_recv_ring, 1);
return ret;
}

/*
Expand Down

0 comments on commit b6fb0df

Please sign in to comment.