patch "usb: gadget: f_fs: do not set cancel function on synchronous" added to usb-linus
Subsystems (2)
This is a note to let you know that I've just added the patch titled
usb: gadget: f_fs: do not set cancel function on synchronous
to my usb git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-linus branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.
If you have any questions about this process, please let me know.
Quoted 1 line
From
4088acf1e845aba35f30fb91dee10649edbd0e84Mon Sep 17 00:00:00 2001
From: Rui Miguel Silva <[email protected]>
Date: Mon, 18 May 2015 16:02:07 +0100
Subject: usb: gadget: f_fs: do not set cancel function on synchronous
{read,write}
do not try to set cancel function in synchronous operations in ffs_epfile_{read,write}_iter.
--- drivers/usb/gadget/function/f_fs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/usb/gadget/function/f_fs.c +4 -2
@@ -924,7 +924,8 @@ static ssize_t ffs_epfile_write_iter(struct kiocb *kiocb, struct iov_iter *from) kiocb->private = p; -kiocb_set_cancel_fn (kiocb, ffs_aio_cancel); +if (p->aio) +kiocb_set_cancel_fn (kiocb, ffs_aio_cancel); res =ffs_epfile_io (kiocb->ki_filp, p);if (res == -EIOCBQUEUED )
@@ -968,7 +969,8 @@ static ssize_t ffs_epfile_read_iter(struct kiocb *kiocb, struct iov_iter *to) kiocb->private = p; -kiocb_set_cancel_fn (kiocb, ffs_aio_cancel); +if (p->aio) +kiocb_set_cancel_fn (kiocb, ffs_aio_cancel); res =ffs_epfile_io (kiocb->ki_filp, p);if (res == -EIOCBQUEUED )
Signature · 1 line
2.4.5