samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UPSTREAM: af_unix: Replace BUG_ON() with WARN_ON_ONCE().

Browse Source 
commit d0f6dc26346863e1f4a23117f5468614e54df064 upstream.

This is a prep patch for the last patch in this series so that
checkpatch will not warn about BUG_ON().

Bug: 404256079
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Acked-by: Jens Axboe <axboe@kernel.dk>
Link: https://lore.kernel.org/r/20240129190435.57228-2-kuniyu@amazon.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Lee Jones <lee@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 36f1f6ac53)
Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: I24f71464f1b5a500c0c5de6cc427c803896ca18f
This commit is contained in:
Kuniyuki Iwashima
2025-05-21 14:45:12 +00:00
committed by Treehugger Robot
parent 3c39219343
commit fb219cbb0b
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
net/unix/garbage.c
View File

@@ -145,7 +145,7 @@ static void scan_children(struct sock *x, void (*func)(struct unix_sock *),
/* An embryo cannot be in-flight, so it's safe /* An embryo cannot be in-flight, so it's safe
* to use the list link. * to use the list link.
*/ */
BUG_ON(!list_empty(&u->link)); WARN_ON_ONCE(!list_empty(&u->link));
list_add_tail(&u->link, &embryos); list_add_tail(&u->link, &embryos);
} }
spin_unlock(&x->sk_receive_queue.lock); spin_unlock(&x->sk_receive_queue.lock);
@@ -224,8 +224,8 @@ static void __unix_gc(struct work_struct *work)
total_refs = file_count(sk->sk_socket->file); total_refs = file_count(sk->sk_socket->file);
BUG_ON(!u->inflight); WARN_ON_ONCE(!u->inflight);
BUG_ON(total_refs < u->inflight); WARN_ON_ONCE(total_refs < u->inflight);
if (total_refs == u->inflight) { if (total_refs == u->inflight) {
list_move_tail(&u->link, &gc_candidates); list_move_tail(&u->link, &gc_candidates);
__set_bit(UNIX_GC_CANDIDATE, &u->gc_flags); __set_bit(UNIX_GC_CANDIDATE, &u->gc_flags);
@@ -318,7 +318,7 @@ static void __unix_gc(struct work_struct *work)
list_move_tail(&u->link, &gc_inflight_list); list_move_tail(&u->link, &gc_inflight_list);
/* All candidates should have been detached by now. */ /* All candidates should have been detached by now. */
BUG_ON(!list_empty(&gc_candidates)); WARN_ON_ONCE(!list_empty(&gc_candidates));
/* Paired with READ_ONCE() in wait_for_unix_gc(). */ /* Paired with READ_ONCE() in wait_for_unix_gc(). */
WRITE_ONCE(gc_in_progress, false); WRITE_ONCE(gc_in_progress, false);

8
net/unix/scm.c
View File

@@ -51,10 +51,10 @@ void unix_inflight(struct user_struct *user, struct file *fp)
if (u) { if (u) {
if (!u->inflight) { if (!u->inflight) {
BUG_ON(!list_empty(&u->link)); WARN_ON_ONCE(!list_empty(&u->link));
list_add_tail(&u->link, &gc_inflight_list); list_add_tail(&u->link, &gc_inflight_list);
} else { } else {
BUG_ON(list_empty(&u->link)); WARN_ON_ONCE(list_empty(&u->link));
} }
u->inflight++; u->inflight++;
/* Paired with READ_ONCE() in wait_for_unix_gc() */ /* Paired with READ_ONCE() in wait_for_unix_gc() */
@@ -71,8 +71,8 @@ void unix_notinflight(struct user_struct *user, struct file *fp)
spin_lock(&unix_gc_lock); spin_lock(&unix_gc_lock);
if (u) { if (u) {
BUG_ON(!u->inflight); WARN_ON_ONCE(!u->inflight);
BUG_ON(list_empty(&u->link)); WARN_ON_ONCE(list_empty(&u->link));
u->inflight--; u->inflight--;
if (!u->inflight) if (!u->inflight)