mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
bcachefs: 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>
This commit is contained in:
parent
032b3fd057
commit
8f9320d3a3
|
@ -97,6 +97,14 @@ static void stdio_buf_init(struct stdio_buf *buf)
|
|||
|
||||
/* 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)
|
||||
{
|
||||
|
@ -142,6 +150,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);
|
||||
bch2_thread_with_file_exit(&thr->thr);
|
||||
darray_exit(&thr->stdio.input.buf);
|
||||
darray_exit(&thr->stdio.output.buf);
|
||||
|
@ -235,10 +244,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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue