Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
6488fcb0
Commit
6488fcb0
authored
Oct 08, 2002
by
David S. Miller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SCTP]: Use sock_owned_by_user.
parent
d0dc914f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
5 deletions
+4
-5
include/net/sctp/sctp.h
include/net/sctp/sctp.h
+0
-1
net/sctp/input.c
net/sctp/input.c
+1
-1
net/sctp/sm_sideeffect.c
net/sctp/sm_sideeffect.c
+3
-3
No files found.
include/net/sctp/sctp.h
View file @
6488fcb0
...
@@ -198,7 +198,6 @@ extern void sctp_hash_digest(const char *secret, const int secret_len,
...
@@ -198,7 +198,6 @@ extern void sctp_hash_digest(const char *secret, const int secret_len,
#define sctp_release_sock(sk) release_sock(sk)
#define sctp_release_sock(sk) release_sock(sk)
#define sctp_bh_lock_sock(sk) bh_lock_sock(sk)
#define sctp_bh_lock_sock(sk) bh_lock_sock(sk)
#define sctp_bh_unlock_sock(sk) bh_unlock_sock(sk)
#define sctp_bh_unlock_sock(sk) bh_unlock_sock(sk)
#define __sctp_sock_busy(sk) ((sk)->lock.users)
#define SCTP_SOCK_SLEEP_PRE(sk) SOCK_SLEEP_PRE(sk)
#define SCTP_SOCK_SLEEP_PRE(sk) SOCK_SLEEP_PRE(sk)
#define SCTP_SOCK_SLEEP_POST(sk) SOCK_SLEEP_POST(sk)
#define SCTP_SOCK_SLEEP_POST(sk) SOCK_SLEEP_POST(sk)
...
...
net/sctp/input.c
View file @
6488fcb0
...
@@ -229,7 +229,7 @@ int sctp_rcv(struct sk_buff *skb)
...
@@ -229,7 +229,7 @@ int sctp_rcv(struct sk_buff *skb)
*/
*/
sctp_bh_lock_sock
(
sk
);
sctp_bh_lock_sock
(
sk
);
if
(
__sctp_sock_busy
(
sk
))
{
if
(
sock_owned_by_user
(
sk
))
{
sk_add_backlog
(
sk
,
(
struct
sk_buff
*
)
chunk
);
sk_add_backlog
(
sk
,
(
struct
sk_buff
*
)
chunk
);
}
else
{
}
else
{
sctp_backlog_rcv
(
sk
,
(
struct
sk_buff
*
)
chunk
);
sctp_backlog_rcv
(
sk
,
(
struct
sk_buff
*
)
chunk
);
...
...
net/sctp/sm_sideeffect.c
View file @
6488fcb0
...
@@ -798,7 +798,7 @@ void sctp_generate_t3_rtx_event(unsigned long peer)
...
@@ -798,7 +798,7 @@ void sctp_generate_t3_rtx_event(unsigned long peer)
/* Check whether a task is in the sock. */
/* Check whether a task is in the sock. */
sctp_bh_lock_sock
(
asoc
->
base
.
sk
);
sctp_bh_lock_sock
(
asoc
->
base
.
sk
);
if
(
__sctp_sock_busy
(
asoc
->
base
.
sk
))
{
if
(
sock_owned_by_user
(
asoc
->
base
.
sk
))
{
SCTP_DEBUG_PRINTK
(
"%s:Sock is busy.
\n
"
,
__FUNCTION__
);
SCTP_DEBUG_PRINTK
(
"%s:Sock is busy.
\n
"
,
__FUNCTION__
);
/* Try again later. */
/* Try again later. */
...
@@ -837,7 +837,7 @@ static void sctp_generate_timeout_event(sctp_association_t *asoc,
...
@@ -837,7 +837,7 @@ static void sctp_generate_timeout_event(sctp_association_t *asoc,
int
error
=
0
;
int
error
=
0
;
sctp_bh_lock_sock
(
asoc
->
base
.
sk
);
sctp_bh_lock_sock
(
asoc
->
base
.
sk
);
if
(
__sctp_sock_busy
(
asoc
->
base
.
sk
))
{
if
(
sock_owned_by_user
(
asoc
->
base
.
sk
))
{
SCTP_DEBUG_PRINTK
(
"%s:Sock is busy: timer %d
\n
"
,
SCTP_DEBUG_PRINTK
(
"%s:Sock is busy: timer %d
\n
"
,
__FUNCTION__
,
__FUNCTION__
,
timeout_type
);
timeout_type
);
...
@@ -911,7 +911,7 @@ void sctp_generate_heartbeat_event(unsigned long data)
...
@@ -911,7 +911,7 @@ void sctp_generate_heartbeat_event(unsigned long data)
sctp_association_t
*
asoc
=
transport
->
asoc
;
sctp_association_t
*
asoc
=
transport
->
asoc
;
sctp_bh_lock_sock
(
asoc
->
base
.
sk
);
sctp_bh_lock_sock
(
asoc
->
base
.
sk
);
if
(
__sctp_sock_busy
(
asoc
->
base
.
sk
))
{
if
(
sock_owned_by_user
(
asoc
->
base
.
sk
))
{
SCTP_DEBUG_PRINTK
(
"%s:Sock is busy.
\n
"
,
__FUNCTION__
);
SCTP_DEBUG_PRINTK
(
"%s:Sock is busy.
\n
"
,
__FUNCTION__
);
/* Try again later. */
/* Try again later. */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment