diff options
| author |   James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-02-04 21:37:52 -0800 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-02-04 21:37:52 -0800 |
| commit | 12ffbbe94d8c0186daccc2e61d5ff87b15aa7bc6 (patch) | |
| tree | b8fe38b24a2070d5b0cb2279f86e98b6dce98c46 /include | |
| parent | Merge remote-tracking branch 'mkp-scsi/4.5/scsi-fixes' into fixes (diff) | |
| parent | block/sd: Return -EREMOTEIO when WRITE SAME and DISCARD are disabled (diff) | |
| download | linux-dev-12ffbbe94d8c0186daccc2e61d5ff87b15aa7bc6.tar.xz linux-dev-12ffbbe94d8c0186daccc2e61d5ff87b15aa7bc6.zip | |
Merge remote-tracking branch 'mkp-scsi/4.5/scsi-fixes' into fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/blkdev.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 29189aeace19..4571ef1a12a9 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -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; |