diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-02-13 08:30:07 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-02-13 08:30:07 +0100 |
| commit | e2d6f8a5f596b1f09839990b11a3c2e0c9f0dbc2 (patch) | |
| tree | 7ccf35788cbb9def996204399f079366da251361 /include/linux/blkdev.h | |
| parent | fed0764fafd8e2e629a033c0f7df4106b0dcb7f0 (diff) | |
| parent | 0cbb0b92689a1c4e0ac55f6188be563a813ac808 (diff) | |
Merge branch 'linus' into locking/core, to resolve conflicts
Conflicts:
kernel/locking/lockdep.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/blkdev.h')
| -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; |