bcachefs: thread_with_file: allow ioctls against these files

Make it so that a thread_with_stdio user can handle ioctls against the
file descriptor.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/thread_with_file.c b/fs/bcachefs/thread_with_file.c
index d298a8e8d2b9699e8db339b75070b519c203920b..d61ede0bda40c9c053fd5fac1cff8e6c48995768 100644 (file)
--- a/fs/bcachefs/thread_with_file.c
+++ b/fs/bcachefs/thread_with_file.c
@@ -247,12 +247,23 @@ static __poll_t thread_with_stdout_poll(struct file *file, struct poll_table_str
        return mask;
 }
 
+static long thread_with_stdio_ioctl(struct file *file, unsigned int cmd, unsigned long p)
+{
+       struct thread_with_stdio *thr =
+               container_of(file->private_data, struct thread_with_stdio, thr);
+
+       if (thr->ops->unlocked_ioctl)
+               return thr->ops->unlocked_ioctl(thr, cmd, p);
+       return -ENOTTY;
+}
+
 static const struct file_operations thread_with_stdio_fops = {
        .llseek         = no_llseek,
        .read           = thread_with_stdio_read,
        .write          = thread_with_stdio_write,
        .poll           = thread_with_stdio_poll,
        .release        = thread_with_stdio_release,
+       .unlocked_ioctl = thread_with_stdio_ioctl,
 };
 
 static const struct file_operations thread_with_stdout_fops = {
@@ -260,6 +271,7 @@ static const struct file_operations thread_with_stdout_fops = {
        .read           = thread_with_stdio_read,
        .poll           = thread_with_stdout_poll,
        .release        = thread_with_stdio_release,
+       .unlocked_ioctl = thread_with_stdio_ioctl,
 };
 
 static int thread_with_stdio_fn(void *arg)

diff --git a/fs/bcachefs/thread_with_file.h b/fs/bcachefs/thread_with_file.h
index 5361611edb4cf8ee2c0e51a9df95430131ab9e32..f0b8c04ed4a47de537788e908775f98d0ca0c874 100644 (file)
--- a/fs/bcachefs/thread_with_file.h
+++ b/fs/bcachefs/thread_with_file.h
@@ -54,6 +54,7 @@ struct thread_with_stdio;
 struct thread_with_stdio_ops {
        void (*exit)(struct thread_with_stdio *);
        void (*fn)(struct thread_with_stdio *);
+       long (*unlocked_ioctl)(struct thread_with_stdio *, unsigned int, unsigned long);
 };
 
 struct thread_with_stdio {