From: Greg Kroah-Hartman Date: Fri, 4 Oct 2019 07:59:56 +0000 (+0200) Subject: Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable... X-Git-Tag: v4.4.195~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=812da2f910efe692fe7f33754fe049dad980e584;p=thirdparty%2Fkernel%2Fstable-queue.git Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable-queue --- 812da2f910efe692fe7f33754fe049dad980e584 diff --cc queue-4.19/fuse-fix-deadlock-with-aio-poll-and-fuse_iqueue-wait.patch index 04fc9462440,79390287a5b..68518b2a65a --- a/queue-4.19/fuse-fix-deadlock-with-aio-poll-and-fuse_iqueue-wait.patch +++ b/queue-4.19/fuse-fix-deadlock-with-aio-poll-and-fuse_iqueue-wait.patch @@@ -74,15 -74,17 +74,17 @@@ Cc: Christoph Hellwig Signed-off-by: Miklos Szeredi Signed-off-by: Sasha Levin ++Signed-off-by: Greg Kroah-Hartman ++ --- - fs/fuse/dev.c | 91 +++++++++++++++++++++++++----------------------- - fs/fuse/fuse_i.h | 3 ++ - fs/fuse/inode.c | 1 + + fs/fuse/dev.c | 91 ++++++++++++++++++++++++++++--------------------------- + fs/fuse/fuse_i.h | 3 + + fs/fuse/inode.c | 1 3 files changed, 51 insertions(+), 44 deletions(-) -diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c -index 6ee471b72a34d..6d39143cfa094 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c -@@ -331,7 +331,7 @@ static void queue_request(struct fuse_iqueue *fiq, struct fuse_req *req) +@@ -331,7 +331,7 @@ static void queue_request(struct fuse_iq req->in.h.len = sizeof(struct fuse_in_header) + len_args(req->in.numargs, (struct fuse_arg *) req->in.args); list_add_tail(&req->list, &fiq->pending);