diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-09-11 14:32:04 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-09-11 14:33:31 +0200 |
| commit | 1f98a13f623e0ef666690a18c1250335fc6d7ef1 (patch) | |
| tree | 15ca2dddffaa18a0d1844957f4f8cc707cbb8117 /block/elevator.c | |
| parent | e7e503aedb1f4d165081cb8d47a58c38f80f0cb4 (diff) | |
| download | linux-0-day-1f98a13f623e0ef666690a18c1250335fc6d7ef1.tar.gz linux-0-day-1f98a13f623e0ef666690a18c1250335fc6d7ef1.tar.xz | |
bio: first step in sanitizing the bio->bi_rw flag testing
Get rid of any functions that test for these bits and make callers
use bio_rw_flagged() directly. Then it is at least directly apparent
what variable and flag they check.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block/elevator.c')
| -rw-r--r-- | block/elevator.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/block/elevator.c b/block/elevator.c index ca861927ba41b..1975b619c86d4 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -79,7 +79,8 @@ int elv_rq_merge_ok(struct request *rq, struct bio *bio) /* * Don't merge file system requests and discard requests */ - if (bio_discard(bio) != bio_discard(rq->bio)) + if (bio_rw_flagged(bio, BIO_RW_DISCARD) != + bio_rw_flagged(rq->bio, BIO_RW_DISCARD)) return 0; /* |