RDS/IB: Make ib_recv_refill return void (b6fb0df1) · Commits · e / devices / android_kernel_teracube_emerald

net/rds/ib.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -323,7 +323,7 @@ void rds_ib_recv_exit(void);
	int rds_ib_recv(struct rds_connection *conn);		int rds_ib_recv(struct rds_connection *conn);
	int rds_ib_recv_alloc_caches(struct rds_ib_connection *ic);		int rds_ib_recv_alloc_caches(struct rds_ib_connection *ic);
	void rds_ib_recv_free_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);		void rds_ib_inc_free(struct rds_incoming *inc);
	int rds_ib_inc_copy_to_user(struct rds_incoming inc, struct iovec iov,		int rds_ib_inc_copy_to_user(struct rds_incoming inc, struct iovec iov,
	size_t size);		size_t size);

net/rds/ib_recv.c

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -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.		* -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_connection *ic = conn->c_transport_data;
	struct rds_ib_recv_work *recv;		struct rds_ib_recv_work *recv;
	@@ -367,14 +367,12 @@ int rds_ib_recv_refill(struct rds_connection *conn, int prefill)
	if (pos >= ic->i_recv_ring.w_nr) {		if (pos >= ic->i_recv_ring.w_nr) {
	printk(KERN_NOTICE "Argh - ring alloc returned pos=%u\n",		printk(KERN_NOTICE "Argh - ring alloc returned pos=%u\n",
	pos);		pos);
	ret = -EINVAL;
	break;		break;
	}		}

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

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

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

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

	/*		/*