From patchwork Mon Jun 22 11:28:37 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: 6655111 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 695AFC05AC for ; Mon, 22 Jun 2015 11:29:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C67C4203F1 for ; Mon, 22 Jun 2015 11:29:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 62FDC203E3 for ; Mon, 22 Jun 2015 11:29:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933217AbbFVL3C (ORCPT ); Mon, 22 Jun 2015 07:29:02 -0400 Received: from mail-lb0-f171.google.com ([209.85.217.171]:33359 "EHLO mail-lb0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756123AbbFVL3B (ORCPT ); Mon, 22 Jun 2015 07:29:01 -0400 Received: by lbbvz5 with SMTP id vz5so58598766lbb.0 for ; Mon, 22 Jun 2015 04:29:00 -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:mime-version:content-type :content-transfer-encoding; bh=dS1IzMYbVTN1VJTXkqdUrW0kxFsAX9I9H8sI2mmjIWc=; b=mXuoSXUdD5QnbBXIKr+KUWuY5DFypq3gru4ZcVyoS1M4S90vxvjVk1eWdH44SBYVVx fJMzUTs2zZlmeYGMoC4RYPe9HhsSVnaMSreobwLLZBGwuiA+Lc2IjjgBeXMBOPYzgAd9 JL0O0ph6ZGqkh5/zHf5jZUPemTqZvM6cEomBM= 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:mime-version :content-type:content-transfer-encoding; bh=dS1IzMYbVTN1VJTXkqdUrW0kxFsAX9I9H8sI2mmjIWc=; b=Lhc2o1t4NIFVVY+jbEiREmcfoaGVHWxdLzZFLEWv70I7pfR28qfX3UAmYgRf+dIUlX 6o5XmeKoJIAvtXr9Ju1ZkY7EyLdJbuaOKVwYsuwZofRhrFaXiIZ3gaOaIsKB0f4OJ8mi l52cgS3H9UE87qPWxLFkyEWuPVqQDqTacoZs+O7RvrwBHnJW419yO8jdrnG0RZ5aDjKy OEJoIuPnQW2nB2xakoy2HbKWaDfVFJQ6kfiA7HCLLRM6/7Bf4WuyE1knAQQRJLlDuAVE N+Ua/iHH2gru3BxMewZTSzSt4psyLbVuEj15eGP6NWk+WpBwyZsbRTR8W4Tqy6scFp5v 32wA== X-Gm-Message-State: ALoCoQmm8UF5ToLncPr1t/EntXMO2iWfkT+dPs3FeuO9gO5XbmoM6jrQUl4idx0kXSrudKBqcdSc X-Received: by 10.112.119.198 with SMTP id kw6mr29038299lbb.97.1434972540237; Mon, 22 Jun 2015 04:29:00 -0700 (PDT) Received: from macroninja.itu.dk ([130.226.133.100]) by mx.google.com with ESMTPSA id la10sm4588985lab.15.2015.06.22.04.28.58 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 Jun 2015 04:28:59 -0700 (PDT) From: =?UTF-8?q?Matias=20Bj=C3=B8rling?= To: axboe@fb.com, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [PATCH] null_blk: fix wrong capacity when bs is not 512 bytes Date: Mon, 22 Jun 2015 13:28:37 +0200 Message-Id: <1434972517-20711-1-git-send-email-m@bjorling.me> X-Mailer: git-send-email 2.1.4 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=-8.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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's capacity using 512 bytes sectors. null_blk calculates the number of sectors by size / bs, which set_capacity is called with. This led to null_blk exposing 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 6f9b753..bf8f764 100644 --- a/drivers/block/null_blk.c +++ b/drivers/block/null_blk.c @@ -588,8 +588,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;