aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZach Brown <zach.brown@oracle.com>2010-06-04 17:26:32 -0400
committerAndy Grover <andy.grover@oracle.com>2010-09-08 21:15:25 -0400
commit671202f3491cccdb267f88ad59ba0635aeb2a22e (patch)
tree0dbe27af4940fa3c6ede0a96b119653c4805185c
parent037f18a3074753991656189a091a5fa371999107 (diff)
rds: remove unused rds_send_acked_before()
rds_send_acked_before() wasn't blocking interrupts when acquiring c_lock from user context but nothing calls it. Rather than fix its use of c_lock we just remove the function. Signed-off-by: Zach Brown <zach.brown@oracle.com>
-rw-r--r--net/rds/rds.h1
-rw-r--r--net/rds/send.c29
2 files changed, 0 insertions, 30 deletions
diff --git a/net/rds/rds.h b/net/rds/rds.h
index cba5f8bb4780..270ded76fd53 100644
--- a/net/rds/rds.h
+++ b/net/rds/rds.h
@@ -724,7 +724,6 @@ void rds_send_drop_to(struct rds_sock *rs, struct sockaddr_in *dest);
724typedef int (*is_acked_func)(struct rds_message *rm, uint64_t ack); 724typedef int (*is_acked_func)(struct rds_message *rm, uint64_t ack);
725void rds_send_drop_acked(struct rds_connection *conn, u64 ack, 725void rds_send_drop_acked(struct rds_connection *conn, u64 ack,
726 is_acked_func is_acked); 726 is_acked_func is_acked);
727int rds_send_acked_before(struct rds_connection *conn, u64 seq);
728void rds_send_remove_from_sock(struct list_head *messages, int status); 727void rds_send_remove_from_sock(struct list_head *messages, int status);
729int rds_send_pong(struct rds_connection *conn, __be16 dport); 728int rds_send_pong(struct rds_connection *conn, __be16 dport);
730struct rds_message *rds_send_get_message(struct rds_connection *, 729struct rds_message *rds_send_get_message(struct rds_connection *,
diff --git a/net/rds/send.c b/net/rds/send.c
index a6295993e3e1..b9e41afef323 100644
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -405,35 +405,6 @@ static inline int rds_send_is_acked(struct rds_message *rm, u64 ack,
405} 405}
406 406
407/* 407/*
408 * Returns true if there are no messages on the send and retransmit queues
409 * which have a sequence number greater than or equal to the given sequence
410 * number.
411 */
412int rds_send_acked_before(struct rds_connection *conn, u64 seq)
413{
414 struct rds_message *rm, *tmp;
415 int ret = 1;
416
417 spin_lock(&conn->c_lock);
418
419 list_for_each_entry_safe(rm, tmp, &conn->c_retrans, m_conn_item) {
420 if (be64_to_cpu(rm->m_inc.i_hdr.h_sequence) < seq)
421 ret = 0;
422 break;
423 }
424
425 list_for_each_entry_safe(rm, tmp, &conn->c_send_queue, m_conn_item) {
426 if (be64_to_cpu(rm->m_inc.i_hdr.h_sequence) < seq)
427 ret = 0;
428 break;
429 }
430
431 spin_unlock(&conn->c_lock);
432
433 return ret;
434}
435
436/*
437 * This is pretty similar to what happens below in the ACK 408 * This is pretty similar to what happens below in the ACK
438 * handling code - except that we call here as soon as we get 409 * handling code - except that we call here as soon as we get
439 * the IB send completion on the RDMA op and the accompanying 410 * the IB send completion on the RDMA op and the accompanying