Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S946044AbcJaTiG (ORCPT ); Mon, 31 Oct 2016 15:38:06 -0400 Received: from mx2.suse.de ([195.135.220.15]:38743 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S945969AbcJaTiF (ORCPT ); Mon, 31 Oct 2016 15:38:05 -0400 From: Hannes Reinecke To: Jens Axboe Cc: Christoph Hellwig , Alexander Graf , Ming@suse.de, "Lei Subject: [PATCH 3/4] loop: Add 'lo_logical_blocksize' Date: Mon, 31 Oct 2016 20:37:18 +0100 Message-Id: <1477942639-109971-4-git-send-email-hare@suse.de> X-Mailer: git-send-email 1.8.5.6 In-Reply-To: <1477942639-109971-1-git-send-email-hare@suse.de> References: <1477942639-109971-1-git-send-email-hare@suse.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2287 Lines: 65 Add a new field 'lo_logical_blocksize' to hold the logical blocksize of the loop device. Signed-off-by: Hannes Reinecke --- drivers/block/loop.c | 9 +++++++-- drivers/block/loop.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index ff5c874..a863667 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -233,8 +233,11 @@ figure_loop_size(struct loop_device *lo, loff_t offset, loff_t sizelimit) lo->lo_offset = offset; if (lo->lo_sizelimit != sizelimit) lo->lo_sizelimit = sizelimit; - if (lo->lo_flags & LO_FLAGS_BLOCKSIZE) + if (lo->lo_flags & LO_FLAGS_BLOCKSIZE) { blk_queue_physical_block_size(lo->lo_queue, lo->lo_blocksize); + blk_queue_logical_block_size(lo->lo_queue, + lo->lo_logical_blocksize); + } set_capacity(lo->lo_disk, x); bd_set_size(bdev, (loff_t)get_capacity(bdev->bd_disk) << 9); /* let user-space know about the new size */ @@ -816,6 +819,7 @@ static void loop_config_discard(struct loop_device *lo) struct file *file = lo->lo_backing_file; struct inode *inode = file->f_mapping->host; struct request_queue *q = lo->lo_queue; + int lo_bits = blksize_bits(lo->lo_logical_blocksize); /* * We use punch hole to reclaim the free space used by the @@ -835,7 +839,7 @@ static void loop_config_discard(struct loop_device *lo) q->limits.discard_granularity = inode->i_sb->s_blocksize; q->limits.discard_alignment = 0; - blk_queue_max_discard_sectors(q, UINT_MAX >> 9); + blk_queue_max_discard_sectors(q, UINT_MAX >> lo_bits); q->limits.discard_zeroes_data = 1; queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, q); } @@ -924,6 +928,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode, lo->use_dio = false; lo->lo_blocksize = lo_blocksize; + lo->lo_logical_blocksize = 512; lo->lo_device = bdev; lo->lo_flags = lo_flags; lo->lo_backing_file = file; diff --git a/drivers/block/loop.h b/drivers/block/loop.h index fb2237c..579f2f7 100644 --- a/drivers/block/loop.h +++ b/drivers/block/loop.h @@ -49,6 +49,7 @@ struct loop_device { struct file * lo_backing_file; struct block_device *lo_device; unsigned lo_blocksize; + unsigned lo_logical_blocksize; void *key_data; gfp_t old_gfp_mask; -- 2.6.6