diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-02 19:48:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-02 19:48:32 -0400 |
| commit | 7b39da786a63e82d9d440075eae9018b79154d2a (patch) | |
| tree | e0c415aa911136293d50e0116bafdc5128bd4080 /include | |
| parent | 2142babac999a5ba169348892a8e3ac222bec7a4 (diff) | |
| parent | 96c16743973e8c1a7b9c655d10b7973408d6d1dd (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
ide-cd: fix REQ_QUIET tests in cdrom_decode_status
Fix up trivial conflicts in include/linux/blkdev.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/blkdev.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 2755d5c6da22..b4f71f1a4af7 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
| @@ -601,6 +601,7 @@ enum { | |||
| 601 | blk_failfast_driver(rq)) | 601 | blk_failfast_driver(rq)) |
| 602 | #define blk_rq_started(rq) ((rq)->cmd_flags & REQ_STARTED) | 602 | #define blk_rq_started(rq) ((rq)->cmd_flags & REQ_STARTED) |
| 603 | #define blk_rq_io_stat(rq) ((rq)->cmd_flags & REQ_IO_STAT) | 603 | #define blk_rq_io_stat(rq) ((rq)->cmd_flags & REQ_IO_STAT) |
| 604 | #define blk_rq_quiet(rq) ((rq)->cmd_flags & REQ_QUIET) | ||
| 604 | 605 | ||
| 605 | #define blk_account_rq(rq) (blk_rq_started(rq) && (blk_fs_request(rq) || blk_discard_rq(rq))) | 606 | #define blk_account_rq(rq) (blk_rq_started(rq) && (blk_fs_request(rq) || blk_discard_rq(rq))) |
| 606 | 607 | ||