Skip to content

Commit 6cee242

Browse files
committed
Revert "workqueue.c: Increase workqueue name length"
This reverts commit 43f0cec which is commit 31c8900 upstream. The workqueue patches backported to 6.8.y caused some reported regressions, so revert them for now. Reported-by: Thorsten Leemhuis <[email protected]> Cc: Tejun Heo <[email protected]> Cc: Marek Szyprowski <[email protected]> Cc: Nathan Chancellor <[email protected]> Cc: Sasha Levin <[email protected]> Cc: Audra Mitchell <[email protected]> Link: https://lore.kernel.org/all/[email protected]/ Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent aadf101 commit 6cee242

1 file changed

Lines changed: 2 additions & 6 deletions

File tree

kernel/workqueue.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ enum {
108108
RESCUER_NICE_LEVEL = MIN_NICE,
109109
HIGHPRI_NICE_LEVEL = MIN_NICE,
110110

111-
WQ_NAME_LEN = 32,
111+
WQ_NAME_LEN = 24,
112112
};
113113

114114
/*
@@ -4666,7 +4666,6 @@ struct workqueue_struct *alloc_workqueue(const char *fmt,
46664666
va_list args;
46674667
struct workqueue_struct *wq;
46684668
struct pool_workqueue *pwq;
4669-
int len;
46704669

46714670
/*
46724671
* Unbound && max_active == 1 used to imply ordered, which is no longer
@@ -4693,12 +4692,9 @@ struct workqueue_struct *alloc_workqueue(const char *fmt,
46934692
}
46944693

46954694
va_start(args, max_active);
4696-
len = vsnprintf(wq->name, sizeof(wq->name), fmt, args);
4695+
vsnprintf(wq->name, sizeof(wq->name), fmt, args);
46974696
va_end(args);
46984697

4699-
if (len >= WQ_NAME_LEN)
4700-
pr_warn_once("workqueue: name exceeds WQ_NAME_LEN. Truncating to: %s\n", wq->name);
4701-
47024698
max_active = max_active ?: WQ_DFL_ACTIVE;
47034699
max_active = wq_clamp_max_active(max_active, flags, wq->name);
47044700

0 commit comments

Comments
 (0)