mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-23 23:32:14 +00:00
sctp: remove macros sctp_bh_[un]lock_sock
Redefined bh_[un]lock_sock to sctp_bh[un]lock_sock for user space friendly code which we haven't use in years, so removing them. Signed-off-by: Wang Weidong <wangweidong1@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
048ed4b626
commit
5bc1d1b4a2
5 changed files with 21 additions and 25 deletions
|
@ -248,7 +248,7 @@ void sctp_generate_t3_rtx_event(unsigned long peer)
|
|||
|
||||
/* Check whether a task is in the sock. */
|
||||
|
||||
sctp_bh_lock_sock(asoc->base.sk);
|
||||
bh_lock_sock(asoc->base.sk);
|
||||
if (sock_owned_by_user(asoc->base.sk)) {
|
||||
pr_debug("%s: sock is busy\n", __func__);
|
||||
|
||||
|
@ -275,7 +275,7 @@ void sctp_generate_t3_rtx_event(unsigned long peer)
|
|||
asoc->base.sk->sk_err = -error;
|
||||
|
||||
out_unlock:
|
||||
sctp_bh_unlock_sock(asoc->base.sk);
|
||||
bh_unlock_sock(asoc->base.sk);
|
||||
sctp_transport_put(transport);
|
||||
}
|
||||
|
||||
|
@ -288,7 +288,7 @@ static void sctp_generate_timeout_event(struct sctp_association *asoc,
|
|||
struct net *net = sock_net(asoc->base.sk);
|
||||
int error = 0;
|
||||
|
||||
sctp_bh_lock_sock(asoc->base.sk);
|
||||
bh_lock_sock(asoc->base.sk);
|
||||
if (sock_owned_by_user(asoc->base.sk)) {
|
||||
pr_debug("%s: sock is busy: timer %d\n", __func__,
|
||||
timeout_type);
|
||||
|
@ -315,7 +315,7 @@ static void sctp_generate_timeout_event(struct sctp_association *asoc,
|
|||
asoc->base.sk->sk_err = -error;
|
||||
|
||||
out_unlock:
|
||||
sctp_bh_unlock_sock(asoc->base.sk);
|
||||
bh_unlock_sock(asoc->base.sk);
|
||||
sctp_association_put(asoc);
|
||||
}
|
||||
|
||||
|
@ -367,7 +367,7 @@ void sctp_generate_heartbeat_event(unsigned long data)
|
|||
struct sctp_association *asoc = transport->asoc;
|
||||
struct net *net = sock_net(asoc->base.sk);
|
||||
|
||||
sctp_bh_lock_sock(asoc->base.sk);
|
||||
bh_lock_sock(asoc->base.sk);
|
||||
if (sock_owned_by_user(asoc->base.sk)) {
|
||||
pr_debug("%s: sock is busy\n", __func__);
|
||||
|
||||
|
@ -392,7 +392,7 @@ void sctp_generate_heartbeat_event(unsigned long data)
|
|||
asoc->base.sk->sk_err = -error;
|
||||
|
||||
out_unlock:
|
||||
sctp_bh_unlock_sock(asoc->base.sk);
|
||||
bh_unlock_sock(asoc->base.sk);
|
||||
sctp_transport_put(transport);
|
||||
}
|
||||
|
||||
|
@ -405,7 +405,7 @@ void sctp_generate_proto_unreach_event(unsigned long data)
|
|||
struct sctp_association *asoc = transport->asoc;
|
||||
struct net *net = sock_net(asoc->base.sk);
|
||||
|
||||
sctp_bh_lock_sock(asoc->base.sk);
|
||||
bh_lock_sock(asoc->base.sk);
|
||||
if (sock_owned_by_user(asoc->base.sk)) {
|
||||
pr_debug("%s: sock is busy\n", __func__);
|
||||
|
||||
|
@ -427,7 +427,7 @@ void sctp_generate_proto_unreach_event(unsigned long data)
|
|||
asoc->state, asoc->ep, asoc, transport, GFP_ATOMIC);
|
||||
|
||||
out_unlock:
|
||||
sctp_bh_unlock_sock(asoc->base.sk);
|
||||
bh_unlock_sock(asoc->base.sk);
|
||||
sctp_association_put(asoc);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue