From: Andy Grover Date: Thu, 4 Mar 2010 03:25:21 +0000 (-0800) Subject: RDS/IB: Do not wait for send ring to be empty on conn shutdown X-Git-Tag: v2.6.37-rc1~147^2~499^2~67 X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=e32b4a70495aac6a612e13f4c21db09dd756ff2c;p=net-next-2.6.git RDS/IB: Do not wait for send ring to be empty on conn shutdown Now that we are signaling send completions much less, we are likely to have dirty entries in the send queue when the connection is shut down (on rmmod, for example.) These are cleaned up a little further down in conn_shutdown, but if we wait on the ring_empty_wait for them, it'll never happen, and we hand on unload. Signed-off-by: Andy Grover --- diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c index b5b5ebbc0bb..1a91af75f4c 100644 --- a/net/rds/ib_cm.c +++ b/net/rds/ib_cm.c @@ -620,8 +620,11 @@ void rds_ib_conn_shutdown(struct rds_connection *conn) ic->i_cm_id, err); } + /* + * Don't wait for the send ring to be empty -- there may be completed + * non-signaled entries sitting on there. We unmap these below. + */ wait_event(rds_ib_ring_empty_wait, - rds_ib_ring_empty(&ic->i_send_ring) && rds_ib_ring_empty(&ic->i_recv_ring)); if (ic->i_send_hdrs)