diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2007-10-16 12:29:29 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2007-10-16 12:29:29 +0200 |
| commit | a39d113936370ba524fa9e34d6954c3625c8aa64 (patch) | |
| tree | 6e4334d4fe9018a6032a2cf47f144e1716ca30ad /mm/bounce.c | |
| parent | 8b6800fbced0c6745a9b8f5f72f15ef8bce8a6be (diff) | |
| parent | 7e3da6c4b9a69f44b758b2c88190ac33ac4ea1a1 (diff) | |
Merge branch 'barrier' into for-linus
Diffstat (limited to 'mm/bounce.c')
| -rw-r--r-- | mm/bounce.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mm/bounce.c b/mm/bounce.c index 3b549bf31f7..b6d2d0f1019 100644 --- a/mm/bounce.c +++ b/mm/bounce.c @@ -265,6 +265,12 @@ void blk_queue_bounce(struct request_queue *q, struct bio **bio_orig) mempool_t *pool; /* + * Data-less bio, nothing to bounce + */ + if (bio_empty_barrier(*bio_orig)) + return; + + /* * for non-isa bounce case, just check if the bounce pfn is equal * to or bigger than the highest pfn in the system -- in that case, * don't waste time iterating over bio segments |