fuse: move interrupt related members to fuse_chan

Move:

 - no_interrupt

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>

diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 81bb40778a5b2090c7a8a411457283794929e339..27357ee01fe5696a937478faf0658766e30fdf1d 100644 (file)
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -615,7 +615,7 @@ static void request_wait_answer(struct fuse_req *req)
        struct fuse_iqueue *fiq = &fc->chan->iq;
        int err;
 
-       if (!fc->no_interrupt) {
+       if (!fc->chan->no_interrupt) {
                /* Any signal may interrupt this */
                err = wait_event_interruptible(req->waitq,
                                        test_bit(FR_FINISHED, &req->flags));
@@ -2308,7 +2308,7 @@ static ssize_t fuse_dev_do_write(struct fuse_dev *fud,
                if (nbytes != sizeof(struct fuse_out_header))
                        err = -EINVAL;
                else if (oh.error == -ENOSYS)
-                       fc->no_interrupt = 1;
+                       fc->chan->no_interrupt = true;
                else if (oh.error == -EAGAIN)
                        err = queue_interrupt(req);
 

diff --git a/fs/fuse/fuse_dev_i.h b/fs/fuse/fuse_dev_i.h
index 916aa98671474eeff7dfd4d752241cc60030b521..5c31272a49024d984203f4f26bab610ae4cf5b1f 100644 (file)
--- a/fs/fuse/fuse_dev_i.h
+++ b/fs/fuse/fuse_dev_i.h
@@ -128,6 +128,9 @@ struct fuse_chan {
        /** The number of requests waiting for completion */
        atomic_t num_waiting;
 
+       /** Is interrupt not implemented by fs? */
+       bool no_interrupt;
+
        /* Use io_uring for communication */
        unsigned int io_uring;
 

diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
index 701bb18dcb001ddea34dfc548ab7b2e7a3174b98..59bdabaf994b1a60dad7c11d93f2b03b7f823194 100644 (file)
--- a/fs/fuse/fuse_i.h
+++ b/fs/fuse/fuse_i.h
@@ -659,9 +659,6 @@ struct fuse_conn {
        /** Is create not implemented by fs? */
        unsigned no_create:1;
 
-       /** Is interrupt not implemented by fs? */
-       unsigned no_interrupt:1;
-
        /** Is bmap not implemented by fs? */
        unsigned no_bmap:1;