From patchwork Fri Jun 5 12:54:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Matias_Bj=C3=B8rling?= X-Patchwork-Id: 6553351 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1E9D49F1C1 for ; Fri, 5 Jun 2015 12:56:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4BBEA206FF for ; Fri, 5 Jun 2015 12:56:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 73ACF206FE for ; Fri, 5 Jun 2015 12:56:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932527AbbFEMy4 (ORCPT ); Fri, 5 Jun 2015 08:54:56 -0400 Received: from mail-lb0-f177.google.com ([209.85.217.177]:33098 "EHLO mail-lb0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754418AbbFEMyy (ORCPT ); Fri, 5 Jun 2015 08:54:54 -0400 Received: by lbcue7 with SMTP id ue7so45468925lbc.0 for ; Fri, 05 Jun 2015 05:54:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bjorling.me; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=SiB5cyxOvwPRrO0VQpEipm5mx/klH1XfOFW7p5GbJuQ=; b=xSJEOuMTGPJB/cdm87CVH3QXjKw/jWTYeR3Koqh9ujWoYLE51IEiPgoluKRLO7T8qp sCv33egZhx3PiIopM2tU8o3re8t1mIBWjv1OGtiWiVfgWWNSyRyGCNEENfv9DPNakSEK 0czIqLR0l41s+PIXg7TDc1QhKM+wXxF62MB1o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=SiB5cyxOvwPRrO0VQpEipm5mx/klH1XfOFW7p5GbJuQ=; b=aiVodxM4NXSt3U8z7U81diqVAVJrkUVckhu65n5ZnqdPAa6piRILJtOnyofX2c2vG9 u6h20pTd70u4aefX2PzhpZWXHd8QPci6WqSKb+gJHqN2oASJQK8HMtXLgI37NgoE6wJN Hk3gCMU+SmHLHJqO7tgmoFuIONdxCFHzKi/Se0Voc8rNVoqjgSrrJvclkHwyr6CtWuAq JK6EV4K1GryLdvQTZaI2+aYBLUtH3U/b3VfCsXIkNcZ6ja5+yYELf7hwsYB38m8lHTr8 oBKaBOIpwePVxpJRcQfWDyA8AC+Y5UmydReXOM3/HUa9qKVVvzt3XqFx/jpsh+/oGuPT /4Zg== X-Gm-Message-State: ALoCoQlW6a1z20xb09Ri3OPb6qk8iXS1RdxMHrzwgn2OnTkciWxBKxpFytkV6mrhGtCeU9+u0h1Q X-Received: by 10.112.134.167 with SMTP id pl7mr3238712lbb.50.1433508892553; Fri, 05 Jun 2015 05:54:52 -0700 (PDT) Received: from macroninja.itu.dk ([130.226.133.111]) by mx.google.com with ESMTPSA id t15sm1751522lbk.0.2015.06.05.05.54.50 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 05 Jun 2015 05:54:51 -0700 (PDT) From: =?UTF-8?q?Matias=20Bj=C3=B8rling?= To: hch@infradead.org, axboe@fb.com, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org Cc: javier@lightnvm.io, Stephen.Bates@pmcs.com, keith.busch@intel.com, =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [PATCH v4 3/8] null_blk: wrong capacity when bs is not 512 bytes Date: Fri, 5 Jun 2015 14:54:25 +0200 Message-Id: <1433508870-28251-4-git-send-email-m@bjorling.me> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1433508870-28251-1-git-send-email-m@bjorling.me> References: <1433508870-28251-1-git-send-email-m@bjorling.me> MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP set_capacity() sets device capacity by the number of 512 bytes sectors. null_blk calculates the number of sectors by size / bs and calls set_capacity. This leads to the wrong number of sectors when bs is not 512 bytes. Signed-off-by: Matias Bjørling --- drivers/block/null_blk.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c index 65cd61a..79972ab 100644 --- a/drivers/block/null_blk.c +++ b/drivers/block/null_blk.c @@ -576,8 +576,7 @@ static int null_add_dev(void) blk_queue_physical_block_size(nullb->q, bs); size = gb * 1024 * 1024 * 1024ULL; - sector_div(size, bs); - set_capacity(disk, size); + set_capacity(disk, size >> 9); disk->flags |= GENHD_FL_EXT_DEVT | GENHD_FL_SUPPRESS_PARTITION_INFO; disk->major = null_major;