xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions 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

9
include/linux/blkdev.h
View File

@@ -682,9 +682,12 @@ static inline bool blk_write_same_mergeable(struct bio *a, struct bio *b)
/*
* q->prep_rq_fn return values
*/
#define BLKPREP_OK 0 /* serve it */
#define BLKPREP_KILL 1 /* fatal error, kill */
#define BLKPREP_DEFER 2 /* leave on queue */
enum {
BLKPREP_OK, /* serve it */
BLKPREP_KILL, /* fatal error, kill, return -EIO */
BLKPREP_DEFER, /* leave on queue */
BLKPREP_INVALID, /* invalid command, kill, return -EREMOTEIO */
};
extern unsigned long blk_max_low_pfn, blk_max_pfn;