summaryrefslogtreecommitdiff
path: root/fs/fuse/dev.c
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@redhat.com>2026-03-18 18:01:27 +0100
committerMiklos Szeredi <mszeredi@redhat.com>2026-06-15 14:06:16 +0200
commit56b4332e12a567eed708bb76eb69d43238a06183 (patch)
tree0b290c628c9c1d476777c6aa8e949456c691d86f /fs/fuse/dev.c
parent7809dc217ab441fdcfbb76fe47bb5bca6d550c8c (diff)
downloadlinux-next-56b4332e12a567eed708bb76eb69d43238a06183.tar.gz
linux-next-56b4332e12a567eed708bb76eb69d43238a06183.zip
fuse: move request timeout to fuse_chan
Move: - timeout Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/fuse/dev.c')
-rw-r--r--fs/fuse/dev.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 52f46efd85ba..19b8cee3cff3 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -364,6 +364,7 @@ struct fuse_chan *fuse_chan_new(void)
fch->initialized = 0;
fch->blocked = 0;
fch->connected = 1;
+ fch->timeout.req_timeout = 0;
return fch;
}
@@ -2541,8 +2542,8 @@ void fuse_abort_conn(struct fuse_conn *fc)
LIST_HEAD(to_end);
unsigned int i;
- if (fc->timeout.req_timeout)
- cancel_delayed_work(&fc->timeout.work);
+ if (fc->chan->timeout.req_timeout)
+ cancel_delayed_work(&fc->chan->timeout.work);
/* Background queuing checks fc->chan->connected under bg_lock */
spin_lock(&fc->chan->bg_lock);