diff options
| author | Vlastimil Babka <vbabka@suse.cz> | 2024-09-05 11:31:32 +0200 |
|---|---|---|
| committer | Vlastimil Babka <vbabka@suse.cz> | 2024-09-10 11:42:27 +0200 |
| commit | e16f4f70987bce1f6a61609145d075c3926179d2 (patch) | |
| tree | 96973f92229534c00f04a512a918cae14be632aa /net | |
| parent | 5be63fc19fcaa4c236b307420483578a56986a37 (diff) | |
| parent | 0f389adb4b80eef29920db2e2c99392aa5d06811 (diff) | |
| download | linux-stable-e16f4f70987bce1f6a61609145d075c3926179d2.tar.gz linux-stable-e16f4f70987bce1f6a61609145d075c3926179d2.tar.bz2 linux-stable-e16f4f70987bce1f6a61609145d075c3926179d2.zip | |
Merge branch 'vfs.file' of gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs into slab/for-6.12/kmem_cache_args
Merge prerequisities from the vfs git tree for the following series that
introduces kmem_cache_args. The vfs.file branch includes the addition of
kmem_cache_create_rcu() which was needed in vfs for the filp cache
optimization. The following series refactors this code.
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/sock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 9abc4fe25953..bbe4c58470c3 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -3429,7 +3429,7 @@ static void sock_def_destruct(struct sock *sk) void sk_send_sigurg(struct sock *sk) { if (sk->sk_socket && sk->sk_socket->file) - if (send_sigurg(&sk->sk_socket->file->f_owner)) + if (send_sigurg(sk->sk_socket->file)) sk_wake_async(sk, SOCK_WAKE_URG, POLL_PRI); } EXPORT_SYMBOL(sk_send_sigurg); |