diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-02 06:42:35 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-02 06:42:35 -0700 |
| commit | af0987f562ce5dc96b4426d7559270c0f157b594 (patch) | |
| tree | ea98f9f79cc97b067aeae975cbbdc32a8d0c902d /drivers/block/brd.c | |
| parent | 391a76b271e7b3bde4b267fbc6a7e465444e7fd6 (diff) | |
| parent | f145f4147857a00bb23251d5d7f0df5791633a92 (diff) | |
Merge "Merge remote-tracking branch 'msm-4.4/tmp-2bf7955' into msm-4.4"
Diffstat (limited to 'drivers/block/brd.c')
| -rw-r--r-- | drivers/block/brd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/brd.c b/drivers/block/brd.c index a5880f4ab40e..1914c63ca8b1 100644 --- a/drivers/block/brd.c +++ b/drivers/block/brd.c @@ -338,7 +338,7 @@ static blk_qc_t brd_make_request(struct request_queue *q, struct bio *bio) if (unlikely(bio->bi_rw & REQ_DISCARD)) { if (sector & ((PAGE_SIZE >> SECTOR_SHIFT) - 1) || - bio->bi_iter.bi_size & PAGE_MASK) + bio->bi_iter.bi_size & ~PAGE_MASK) goto io_error; discard_from_brd(brd, sector, bio->bi_iter.bi_size); goto out; |