diff options
| author | Will Deacon <will.deacon@arm.com> | 2017-06-26 11:54:27 +0200 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2017-06-26 11:54:27 +0200 |
| commit | 3edb1dd13ce6f6480c1f2bffc47a49cf959fa9cb (patch) | |
| tree | 81e5823a1c84a0131dc110f711f3c1416b4df985 /drivers/block/rbd.c | |
| parent | Merge branch 'perf/updates' into aarch64/for-next/core (diff) | |
| parent | acpi: apei: check for pending errors when probing GHES entries (diff) | |
| download | linux-3edb1dd13ce6f6480c1f2bffc47a49cf959fa9cb.tar.xz linux-3edb1dd13ce6f6480c1f2bffc47a49cf959fa9cb.zip | |
Merge branch 'aarch64/for-next/ras-apei' into aarch64/for-next/core
Merge in arm64 ACPI RAS support (APEI/GHES) from Tyler Baicar.
Diffstat (limited to 'drivers/block/rbd.c')
| -rw-r--r-- | drivers/block/rbd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 454bf9c34882..c16f74547804 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -4023,6 +4023,7 @@ static void rbd_queue_workfn(struct work_struct *work) switch (req_op(rq)) { case REQ_OP_DISCARD: + case REQ_OP_WRITE_ZEROES: op_type = OBJ_OP_DISCARD; break; case REQ_OP_WRITE: @@ -4420,6 +4421,7 @@ static int rbd_init_disk(struct rbd_device *rbd_dev) q->limits.discard_granularity = segment_size; q->limits.discard_alignment = segment_size; blk_queue_max_discard_sectors(q, segment_size / SECTOR_SIZE); + blk_queue_max_write_zeroes_sectors(q, segment_size / SECTOR_SIZE); if (!ceph_test_opt(rbd_dev->rbd_client->client, NOCRC)) q->backing_dev_info->capabilities |= BDI_CAP_STABLE_WRITES; |