summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@linux.dev>2024-02-08 20:27:06 -0500
committerKent Overstreet <kent.overstreet@linux.dev>2024-02-27 13:59:04 -0500
commitef74fbc247ebe512fdb3d2e9e746f8664ca47c20 (patch)
tree8227ad0b193a472a226ad93dc64d244631a3951f
parent5323b59bdf61c2eef906a812bcbf75071af6544c (diff)
thread_with_stdio: Mark completed in ->release()
This fixes stdio_redirect_read() getting stuck, not noticing that the pipe has been closed. Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
-rw-r--r--lib/thread_with_file.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/thread_with_file.c b/lib/thread_with_file.c
index 092996ca43fe..f4946a437332 100644
--- a/lib/thread_with_file.c
+++ b/lib/thread_with_file.c
@@ -201,6 +201,14 @@ EXPORT_SYMBOL_GPL(run_thread_with_file);
/* thread_with_stdio */
+static void thread_with_stdio_done(struct thread_with_stdio *thr)
+{
+ thr->thr.done = true;
+ thr->stdio.done = true;
+ wake_up(&thr->stdio.input.wait);
+ wake_up(&thr->stdio.output.wait);
+}
+
static ssize_t thread_with_stdio_read(struct file *file, char __user *ubuf,
size_t len, loff_t *ppos)
{
@@ -315,6 +323,7 @@ static int thread_with_stdio_release(struct inode *inode, struct file *file)
struct thread_with_stdio *thr =
container_of(file->private_data, struct thread_with_stdio, thr);
+ thread_with_stdio_done(thr);
thread_with_file_exit(&thr->thr);
darray_exit(&thr->stdio.input.buf);
darray_exit(&thr->stdio.output.buf);
@@ -336,10 +345,7 @@ static int thread_with_stdio_fn(void *arg)
thr->fn(thr);
- thr->thr.done = true;
- thr->stdio.done = true;
- wake_up(&thr->stdio.input.wait);
- wake_up(&thr->stdio.output.wait);
+ thread_with_stdio_done(thr);
return 0;
}