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
12028f96
Commit
12028f96
authored
Aug 06, 2004
by
David S. Miller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[NET]: Move sndmsg_page destruction back into TCP for now.
Signed-off-by:
David S. Miller
<
davem@redhat.com
>
parent
89a4a37e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
net/core/sock.c
net/core/sock.c
+0
-8
net/ipv4/tcp_ipv4.c
net/ipv4/tcp_ipv4.c
+8
-0
No files found.
net/core/sock.c
View file @
12028f96
...
@@ -652,14 +652,6 @@ void sk_free(struct sock *sk)
...
@@ -652,14 +652,6 @@ void sk_free(struct sock *sk)
printk
(
KERN_DEBUG
"%s: optmem leakage (%d bytes) detected.
\n
"
,
printk
(
KERN_DEBUG
"%s: optmem leakage (%d bytes) detected.
\n
"
,
__FUNCTION__
,
atomic_read
(
&
sk
->
sk_omem_alloc
));
__FUNCTION__
,
atomic_read
(
&
sk
->
sk_omem_alloc
));
/*
* If sendmsg cached page exists, toss it.
*/
if
(
sk
->
sk_sndmsg_page
)
{
__free_page
(
sk
->
sk_sndmsg_page
);
sk
->
sk_sndmsg_page
=
NULL
;
}
security_sk_free
(
sk
);
security_sk_free
(
sk
);
kmem_cache_free
(
sk
->
sk_slab
,
sk
);
kmem_cache_free
(
sk
->
sk_slab
,
sk
);
module_put
(
owner
);
module_put
(
owner
);
...
...
net/ipv4/tcp_ipv4.c
View file @
12028f96
...
@@ -2113,6 +2113,14 @@ int tcp_v4_destroy_sock(struct sock *sk)
...
@@ -2113,6 +2113,14 @@ int tcp_v4_destroy_sock(struct sock *sk)
if
(
tp
->
bind_hash
)
if
(
tp
->
bind_hash
)
tcp_put_port
(
sk
);
tcp_put_port
(
sk
);
/*
* If sendmsg cached page exists, toss it.
*/
if
(
sk
->
sk_sndmsg_page
)
{
__free_page
(
sk
->
sk_sndmsg_page
);
sk
->
sk_sndmsg_page
=
NULL
;
}
atomic_dec
(
&
tcp_sockets_allocated
);
atomic_dec
(
&
tcp_sockets_allocated
);
return
0
;
return
0
;
...
...
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