Skip to content

Commit 1df0d4c

Browse files
namjaejeonSteve French
authored andcommitted
ksmbd: fix WARNING "do not call blocking ops when !TASK_RUNNING"
wait_event_timeout() will set the state of the current task to TASK_UNINTERRUPTIBLE, before doing the condition check. This means that ksmbd_durable_scavenger_alive() will try to acquire the mutex while already in a sleeping state. The scheduler warns us by giving the following warning: do not call blocking ops when !TASK_RUNNING; state=2 set at [<0000000061515a6f>] prepare_to_wait_event+0x9f/0x6c0 WARNING: CPU: 2 PID: 4147 at kernel/sched/core.c:10099 __might_sleep+0x12f/0x160 mutex lock is not needed in ksmbd_durable_scavenger_alive(). Signed-off-by: Namjae Jeon <[email protected]> Signed-off-by: Steve French <[email protected]>
1 parent 1e440d5 commit 1df0d4c

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

fs/smb/server/vfs_cache.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -713,12 +713,8 @@ static bool tree_conn_fd_check(struct ksmbd_tree_connect *tcon,
713713

714714
static bool ksmbd_durable_scavenger_alive(void)
715715
{
716-
mutex_lock(&durable_scavenger_lock);
717-
if (!durable_scavenger_running) {
718-
mutex_unlock(&durable_scavenger_lock);
716+
if (!durable_scavenger_running)
719717
return false;
720-
}
721-
mutex_unlock(&durable_scavenger_lock);
722718

723719
if (kthread_should_stop())
724720
return false;
@@ -799,9 +795,7 @@ static int ksmbd_durable_scavenger(void *dummy)
799795
break;
800796
}
801797

802-
mutex_lock(&durable_scavenger_lock);
803798
durable_scavenger_running = false;
804-
mutex_unlock(&durable_scavenger_lock);
805799

806800
module_put(THIS_MODULE);
807801

0 commit comments

Comments
 (0)