rk: revert 20f3d0b+v3.0.66 to v3.0

[firefly-linux-kernel-4.4.55.git] / net / rds / af_rds.c

diff --git a/net/rds/af_rds.c b/net/rds/af_rds.c
index 424ff622ab5f8e77dc69c7b54b98bdaafa350329..bb6ad81b671d055b89fbe74287ed328a834aac03 100644 (file)
--- a/net/rds/af_rds.c
+++ b/net/rds/af_rds.c
@@ -68,6 +68,7 @@ static int rds_release(struct socket *sock)
 {
        struct sock *sk = sock->sk;
        struct rds_sock *rs;
+       unsigned long flags;
 
        if (!sk)
                goto out;
@@ -93,10 +94,10 @@ static int rds_release(struct socket *sock)
        rds_rdma_drop_keys(rs);
        rds_notify_queue_get(rs, NULL);
 
-       spin_lock_bh(&rds_sock_lock);
+       spin_lock_irqsave(&rds_sock_lock, flags);
        list_del_init(&rs->rs_item);
        rds_sock_count--;
-       spin_unlock_bh(&rds_sock_lock);
+       spin_unlock_irqrestore(&rds_sock_lock, flags);
 
        rds_trans_put(rs->rs_transport);
 
@@ -408,6 +409,7 @@ static const struct proto_ops rds_proto_ops = {
 
 static int __rds_create(struct socket *sock, struct sock *sk, int protocol)
 {
+       unsigned long flags;
        struct rds_sock *rs;
 
        sock_init_data(sock, sk);
@@ -424,10 +426,10 @@ static int __rds_create(struct socket *sock, struct sock *sk, int protocol)
        spin_lock_init(&rs->rs_rdma_lock);
        rs->rs_rdma_keys = RB_ROOT;
 
-       spin_lock_bh(&rds_sock_lock);
+       spin_lock_irqsave(&rds_sock_lock, flags);
        list_add_tail(&rs->rs_item, &rds_sock_list);
        rds_sock_count++;
-       spin_unlock_bh(&rds_sock_lock);
+       spin_unlock_irqrestore(&rds_sock_lock, flags);
 
        return 0;
 }
@@ -469,11 +471,12 @@ static void rds_sock_inc_info(struct socket *sock, unsigned int len,
 {
        struct rds_sock *rs;
        struct rds_incoming *inc;
+       unsigned long flags;
        unsigned int total = 0;
 
        len /= sizeof(struct rds_info_message);
 
-       spin_lock_bh(&rds_sock_lock);
+       spin_lock_irqsave(&rds_sock_lock, flags);
 
        list_for_each_entry(rs, &rds_sock_list, rs_item) {
                read_lock(&rs->rs_recv_lock);
@@ -489,7 +492,7 @@ static void rds_sock_inc_info(struct socket *sock, unsigned int len,
                read_unlock(&rs->rs_recv_lock);
        }
 
-       spin_unlock_bh(&rds_sock_lock);
+       spin_unlock_irqrestore(&rds_sock_lock, flags);
 
        lens->nr = total;
        lens->each = sizeof(struct rds_info_message);
@@ -501,10 +504,11 @@ static void rds_sock_info(struct socket *sock, unsigned int len,
 {
        struct rds_info_socket sinfo;
        struct rds_sock *rs;
+       unsigned long flags;
 
        len /= sizeof(struct rds_info_socket);
 
-       spin_lock_bh(&rds_sock_lock);
+       spin_lock_irqsave(&rds_sock_lock, flags);
 
        if (len < rds_sock_count)
                goto out;
@@ -525,7 +529,7 @@ out:
        lens->nr = rds_sock_count;
        lens->each = sizeof(struct rds_info_socket);
 
-       spin_unlock_bh(&rds_sock_lock);
+       spin_unlock_irqrestore(&rds_sock_lock, flags);
 }
 
 static void rds_exit(void)