apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'mkp-scsi/4.5/scsi-fixes' into fixes

Browse Source
This commit is contained in:
James Bottomley
2016-02-04 21:37:52 -08:00
parent 6344a5cd3e 0fb5b1fb30
commit 12ffbbe94d
8 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
block/blk-core.c
+4 -2
View File
@@ -2455,14 +2455,16 @@ struct request *blk_peek_request(struct request_queue *q)
rq = NULL;
break;
} else if (ret == BLKPREP_KILL) {
} else if (ret == BLKPREP_KILL || ret == BLKPREP_INVALID) {
int err = (ret == BLKPREP_INVALID) ? -EREMOTEIO : -EIO;
rq->cmd_flags |= REQ_QUIET;
/*
* Mark this request as started so we don't trigger
* any debug logic in the end I/O path.
*/
blk_start_request(rq);
__blk_end_request_all(rq, -EIO);
__blk_end_request_all(rq, err);
} else {
printk(KERN_ERR "%s: bad return=%d\n", __func__, ret);
break;