diff --git a/[refs] b/[refs] index 140f0183edb7..ef8779a9ed43 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a424077a0a48d5b2e1bdbb8cc56fd43abfd7fd6c +refs/heads/master: 18062ca94714a66e75da8a22e010d0e8e61ab4cd diff --git a/trunk/net/rds/af_rds.c b/trunk/net/rds/af_rds.c index 937ecda4abe7..c2e45e8efa20 100644 --- a/trunk/net/rds/af_rds.c +++ b/trunk/net/rds/af_rds.c @@ -451,7 +451,6 @@ static void rds_sock_inc_info(struct socket *sock, unsigned int len, struct rds_info_lengths *lens) { struct rds_sock *rs; - struct sock *sk; struct rds_incoming *inc; unsigned long flags; unsigned int total = 0; @@ -461,7 +460,6 @@ static void rds_sock_inc_info(struct socket *sock, unsigned int len, spin_lock_irqsave(&rds_sock_lock, flags); list_for_each_entry(rs, &rds_sock_list, rs_item) { - sk = rds_rs_to_sk(rs); read_lock(&rs->rs_recv_lock); /* XXX too lazy to maintain counts.. */