diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-06-15 18:08:07 -0700 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-06-15 18:08:07 -0700 |
| commit | 7eef4091a653c243a87e5375c54504cc03bec4d8 (patch) | |
| tree | f65b77f830b2c8f7d014512badfef5df0d591ee9 /block/blk.h | |
| parent | 0a93a47f042c459f0f46942c3a920e3c81878031 (diff) | |
| parent | 07a2039b8eb0af4ff464efd3dfd95de5c02648c6 (diff) | |
| download | op-kernel-dev-7eef4091a653c243a87e5375c54504cc03bec4d8.zip op-kernel-dev-7eef4091a653c243a87e5375c54504cc03bec4d8.tar.gz | |
Merge commit 'v2.6.30' into for-2.6.31
Diffstat (limited to 'block/blk.h')
| -rw-r--r-- | block/blk.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/block/blk.h b/block/blk.h index 5dfc412..79c85f7 100644 --- a/block/blk.h +++ b/block/blk.h @@ -114,12 +114,7 @@ static inline int blk_cpu_to_group(int cpu) static inline int blk_do_io_stat(struct request *rq) { - struct gendisk *disk = rq->rq_disk; - - if (!disk || !disk->queue) - return 0; - - return blk_queue_io_stat(disk->queue) && (rq->cmd_flags & REQ_ELVPRIV); + return rq->rq_disk && blk_rq_io_stat(rq); } #endif |
