leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mtd: powernv_flash: Don't return -ERESTARTSYS on interrupted token acquisition

Browse Source 
Because the MTD core might split up a read() or write() from userspace
into several calls to the driver, we may fail to get a token but already
have done some work, best to return -EINTR back to userspace and have
them decide what to do.

Signed-off-by: Cyril Bur <cyrilbur@gmail.com>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Cyril Bur
2017-11-03 13:41:40 +11:00
committed by Michael Ellerman
parent e32ec15a2d
commit efe6941450
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/mtd/devices/powernv_flash.c
View File

@@ -47,6 +47,11 @@ enum flash_op {
FLASH_OP_ERASE, FLASH_OP_ERASE,
}; };
/*
* Don't return -ERESTARTSYS if we can't get a token, the MTD core
* might have split up the call from userspace and called into the
* driver more than once, we'll already have done some amount of work.
*/
static int powernv_flash_async_op(struct mtd_info *mtd, enum flash_op op, static int powernv_flash_async_op(struct mtd_info *mtd, enum flash_op op,
loff_t offset, size_t len, size_t *retlen, u_char *buf) loff_t offset, size_t len, size_t *retlen, u_char *buf)
{ {
@@ -63,6 +68,8 @@ static int powernv_flash_async_op(struct mtd_info *mtd, enum flash_op op,
if (token < 0) { if (token < 0) {
if (token != -ERESTARTSYS) if (token != -ERESTARTSYS)
dev_err(dev, "Failed to get an async token\n"); dev_err(dev, "Failed to get an async token\n");
else
token = -EINTR;
return token; return token;
} }