From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161052AbbGQH1S (ORCPT ); Fri, 17 Jul 2015 03:27:18 -0400 Received: from cantor2.suse.de ([195.135.220.15]:34238 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932297AbbGQH1K (ORCPT ); Fri, 17 Jul 2015 03:27:10 -0400 From: Hannes Reinecke To: Jens Axboe Cc: Alexander Graf , Christoph Hellwig , linux-kernel@vger.kernel.org, Hannes Reinecke Subject: [PATCH 4/4] loop: Pass logical blocksize in 'lo_init[0]' ioctl field Date: Fri, 17 Jul 2015 09:27:07 +0200 Message-Id: <1437118027-94602-5-git-send-email-hare@suse.de> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1437118027-94602-1-git-send-email-hare@suse.de> References: <1437118027-94602-1-git-send-email-hare@suse.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The current LOOP_SET_STATUS64 ioctl has two unused fields 'init[2]', which can be used in conjunction with the LO_FLAGS_BLOCKSIZE flag to pass in the new logical blocksize. Signed-off-by: Hannes Reinecke --- drivers/block/loop.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 321f296..3d2ee0f 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -963,11 +963,21 @@ loop_set_status(struct loop_device *lo, const struct loop_info64 *info) if (err) return err; - if (info->lo_flags & LO_FLAGS_BLOCKSIZE) + if (info->lo_flags & LO_FLAGS_BLOCKSIZE) { lo->lo_flags |= LO_FLAGS_BLOCKSIZE; + if ((info->lo_init[0] != 512) && + (info->lo_init[0] != 1024) && + (info->lo_init[0] != 2048) && + (info->lo_init[0] != 4096)) + return -EINVAL; + if (info->lo_init[0] > lo->lo_blocksize) + return -EINVAL; + lo->lo_logical_blocksize = info->lo_init[0]; + } if (lo->lo_offset != info->lo_offset || - lo->lo_sizelimit != info->lo_sizelimit) + lo->lo_sizelimit != info->lo_sizelimit || + lo->lo_flags & LO_FLAGS_BLOCKSIZE) if (figure_loop_size(lo, info->lo_offset, info->lo_sizelimit)) return -EFBIG; -- 1.8.5.2