From patchwork Fri Sep 30 04:11:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 9357631 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 896236086A for ; Fri, 30 Sep 2016 04:12:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 925CF29DBA for ; Fri, 30 Sep 2016 04:12:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8411F29DA0; Fri, 30 Sep 2016 04:12:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 24E3E29DA0 for ; Fri, 30 Sep 2016 04:12:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752755AbcI3EMD (ORCPT ); Fri, 30 Sep 2016 00:12:03 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:50502 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752088AbcI3EL7 (ORCPT ); Fri, 30 Sep 2016 00:11:59 -0400 X-IronPort-AV: E=Sophos;i="5.31,418,1473091200"; d="scan'208";a="22622624" Received: from mail-co1nam03lp0024.outbound.protection.outlook.com (HELO NAM03-CO1-obe.outbound.protection.outlook.com) ([216.32.181.24]) by ob1.hgst.iphmx.com with ESMTP; 30 Sep 2016 12:12:00 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-hgst-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=q0ZqYBIDYAMGT36QRG/qKOPSPEmljfZdTj9Zc027Tz8=; b=kHy0Jjwr+4FMtexhE+IXjiUrFqM7lCmSTwjnvKWlaDNZDm6x+xvIQQSrN73JD27tWMA+wO+NAGxJ0ddF2YJpcI81RP+alf1h1O/73D3dhi9BKHmyYyj6uG6RxKN3U6yTfPyHzzfA4wMwxp2L6Qo1FIR/t00tTcxd2Fg5IUEd0Uk= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Damien.LeMoal@hgst.com; Received: from washi.fujisawa.hgst.com (199.255.47.8) by CY1PR04MB1979.namprd04.prod.outlook.com (10.166.191.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.639.5; Fri, 30 Sep 2016 04:11:56 +0000 From: Damien Le Moal To: Jens Axboe CC: , , Christoph Hellwig , "Martin K . Petersen" , Hannes Reinecke , Shaun Tancheff , Damien Le Moal , Hannes Reinecke Subject: [PATCH v5 3/7] block: update chunk_sectors in blk_stack_limits() Date: Fri, 30 Sep 2016 13:11:35 +0900 Message-ID: <1475208699-27310-4-git-send-email-damien.lemoal@hgst.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1475208699-27310-1-git-send-email-damien.lemoal@hgst.com> References: <1475208699-27310-1-git-send-email-damien.lemoal@hgst.com> MIME-Version: 1.0 X-Originating-IP: [199.255.47.8] X-ClientProxiedBy: BY2PR12CA0020.namprd12.prod.outlook.com (10.160.121.30) To CY1PR04MB1979.namprd04.prod.outlook.com (10.166.191.15) X-MS-Office365-Filtering-Correlation-Id: 3dfb72d5-1fcb-4618-6cbc-08d3e8e7ebaf X-Microsoft-Exchange-Diagnostics: 1; CY1PR04MB1979; 2:J4JXkGo5r8sYDZxFy4zv5Lfic8wkwNoXeaOqKdmivx8qrXkSqICZfatILIcx6WOPpC87f4n+LimPz4TBSi/Z+coGNwqMVttCSq3la+CuTHxxdKGkgfFLx4lgqQcDE7EhHb+WnU8RNQhbheK8sEhx1TzgFaJUSC3T0nsML/L8bDoBV6VltSMCTSI18aGflTky; 3:NwLFwC/mGORREGkZBcVlD0Oz5I8l2ktOYdu34xq4W/OMJSVZrFDbNyWOWMFfC/kn7+Y5tiHHVPgFGoZ/NTjAh7xwF3G/ZMZheS6fIQjwGzXdhd/zDxEAG/wHHvncFyBC; 25:5kwE0mDM7NZhHBuY8jkPfCMwbk8jXferzvzTSMfLMKytwru7NIfMaRq8FZTnkndR2Ulzmhy26wSplDUt/dS273gQZg7TnHnsvfsvJ+Y5PTyjGIa/4Iu6Cvj2gf7YrBEK7dbZl+0BBz2giG2zERDiDcPmP4t/zoQqP1vr1yqrKRIZ7dpC5zPJVDlnkVigeo7VKNsGpVX0X3f8aVvPZ+mAnvYNJAomlTsO244qRWc5PPH98hiMUAFLXdvogeTdIAvZ7ngar9yJ3NvX6u3SnJoW7OsYNIHR8OaTvZu3bgPaKbhiTDGpf7cTFrgKEJx4rPF1yCTsiSp0e9xcU6VSPbIwqDYKAR3lAHbnMjr6hACQUoUDF/nUCASphBlEE98P66ismn8UIVnOMCzA/Juw9Nae/DlfKIrcVHDtBofy1L/mnqw= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR04MB1979; X-Microsoft-Exchange-Diagnostics: 1; CY1PR04MB1979; 31:NXzlo0RoTEX0aGIg6g+QgFpC5/ifcmVUQ/3Zx08h/sOb1yVovuz8jvTeXP6Fw8pRniUzFspH78XqtHrvYAtaYNsQtVRtMjHV4xq5yeN8JFyYPKmshjTwHL3V+v5kk/0sezZBbYv4TaMECeD3Aij1DWCOht+Ma3Q8j2JFlxn93R0eXTCGaSGeEpYXe/pddiwHbSepKApqt0i0QiQix48cSQpicwz+hdM6p2IbRAq8Imk=; 20:tFh8vr9nBJkYVfRsaRyh6ka3FN+cJXhlXhxpipWZWBlWWPOHQuvXHm4mq/UORP0QGOE3jxoLyG55z/cz+8cN3q53Vq7oAOQyxAUXrJNPK8Jw0lNKt+ooUU4XZOWDY5v0EyspvJvVSUuNFjmn5O2jppEz4YpoE7qfOvvptOkuwqqUPfxWlT+B/y7wC3IClj2R/mKxm9X1QhD+wKq0zvJ7QLtf9854wbqM+z0YKRfdb/3Zs7fTBPrgEsrMg4WrI5gv3K704Jta4Xfe0JmVI5BaUlwyXTr+gptA5E6X99MHAfrM2eU7acmh2/bvXV+HvrBJRAFHNsp6U+mzEhgvQI05YC43jJ6q+JbPRaC0u1ZpV5sXpKuEOvmH44xX+eEZxhTjad1pXWYjQ3QF5d+Dm+86A+zFekfqw5zBCRGv4ixlhuPMwThIGc3KKheCNLw/XEBpr6mUBwUsiuGHP1SuMTt17EIVHsfa4ZmvQXM0O501Xv1GoFJsgX/pWs8ku0mwGnsv X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(79135771888625)(146099531331640); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6055026); SRVR:CY1PR04MB1979; BCL:0; PCL:0; RULEID:; SRVR:CY1PR04MB1979; X-Microsoft-Exchange-Diagnostics: 1; CY1PR04MB1979; 4:ZfercFZnyqviD15YPsA7Eyp8lRt1KKGOnV0Ah964fwFHSvFWGoHLVSZMF8ij0yRYsqt+fYB0BMb79WoRAGY5voK2uradsHEIgbc73ALi5JKVlckO8M4ff2vAVyUvzErq053D/DAnPgawr035c3r1+yfD/kZrSaCDVnI82lsO8oqg8bcjoNg+hXPZFMVN7pdPJIoRxj4Hq+LeG8ZSB0fICjy+hrKcjeBzORwFPs/AMUCrK2kzd2yXt1RiP1pzT+RvxIMR3s/KqNfVsbEFrZPH/8KWRM8i0cCDqPsnHyBzz0L9LNgE3Ha1Co8YZEIaSnn/OnxlKX+v6bS0XAoMk8YLpxAv3pI7BC7PcAjYg/k5NpQ1xaN+EwhMp6JQ/pYofuWIXTT83y734pL6VcaYbtWJJzi5qUwj5jmLQOLncUpJFPRzr/ENwkeWsDrAyAi95KSBbRcaewtM0Daj2grxSvCSMf/TaU42EmTeYUed18sVIcM= X-Forefront-PRVS: 008184426E X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(8676002)(42186005)(2950100002)(81156014)(6916009)(6666003)(81166006)(5003940100001)(47776003)(66066001)(229853001)(106356001)(7846002)(105586002)(305945005)(2906002)(36756003)(189998001)(7736002)(5660300001)(76176999)(50986999)(97736004)(586003)(4326007)(3846002)(50226002)(33646002)(50466002)(86362001)(68736007)(77096005)(110136003)(101416001)(19580395003)(92566002)(19580405001)(48376002)(6116002)(7099028); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR04MB1979; H:washi.fujisawa.hgst.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: hgst.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR04MB1979; 23:uaBr0uA/DD6dg6nOYtsSTbQ6l/vmDme5COh6OJhkX?= =?us-ascii?Q?DQsX5utfIlOJU2EblvTL6EtbOyZiXwxRUjEkjx+tY3sbQB27UGsj9i0jPem+?= =?us-ascii?Q?CUq1uFHt7xPst6CBNbvxgWvV0MKdH+GQVcNcLi2eY59Lu01Wl4Rcj2eJMJcB?= =?us-ascii?Q?/I4Ac7GwwPo7knF476Lqkouz8rH2jm0+oy8DdubwoJGGWttfY/QkkdTYsb9L?= =?us-ascii?Q?/FkuFnxFwHSAGnqBPtOaNIkDVd9vTKWJQ65EdfKfJXA1w5CjCFGVdUZlP6nZ?= =?us-ascii?Q?ZqdV8s7HDQMMeG1f+b/dejsvUuZ5PoeC4IxUgR2s9aaJG9vYV6Laya8bvnYZ?= =?us-ascii?Q?cJy6VNWjOLsl6Rmiijflqoi6KYLcb3g3BEKLrrm6X2MaKuWPdDeXrnDyI5hN?= =?us-ascii?Q?WbrN6N6m4qBU447kNEKw45RtdyD+pLWqvPFptZh59uUYdISbY7UCI9iDVHIc?= =?us-ascii?Q?cGs1PsuiylQsbKRhvwZLF6V+w+B+wOrCioQ/jrVSjnB8NjPUM5f4JOFM4nC0?= =?us-ascii?Q?nGz5bfUHayErRT+zvzJmXyfOH/sTDUsWI+iufQ4P26UhuNkVwf01PFlCDv/I?= =?us-ascii?Q?iiml6J0qqY3EUyNYsfQyARHhlTkbdnOlndC3UryDL4EO+a6qkswJenmUVQf6?= =?us-ascii?Q?LeWDXIygpzh2Tm1foySQjv4bwlbr/vYXfl6GEU/TobdiFVXq5VO/FleaV77P?= =?us-ascii?Q?vEBJOyQ/fio7bUSn6GX1zEhAq8UdJuO1ZbiJEaZilOLlsg0o/Ne9rZz7u4Mp?= =?us-ascii?Q?4KfOnXb574wpy01uwUi9NWEht/RZv1md7WshmP3MDojRfHGvCd/4nF8onn+I?= =?us-ascii?Q?b039Em1IDPyHRV7AeI2bE2zNbOz2E/S+RbVItCxZFifAC+CzeRvA0kKfwxdw?= =?us-ascii?Q?kJil0qYMou+11lYc14ktFIVd3snhO/guzQyERowGzWyT4fMdFilOJ0hDPmYk?= =?us-ascii?Q?VN2T0gNOy7whAjeihPUTi+dw44Hc6zx9nOINkKcZYxtkGavivdC80sptBn03?= =?us-ascii?Q?GxEpbs8mVPfwdlI5dlTMlLmQwQj4JzSM60oe3Ig30DbvYHtyJVQJLRP/8Ld+?= =?us-ascii?Q?IBsAlnulCR+qcjHx29t5ipX19u8rQVE7q9or8A22Rtbns15OQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR04MB1979; 6:S0+Poofw+ESd8WpXdpUdpAxjqJb2lBgBsLSupdGxt3GLZCPa948ew2A54xf8AzxnvtZ53oXakLF4QVekZWnx22pCad58+W2oawyZ5PPd1PwIxRDg99p0gWttdndAug9ob56k1fftP2x0AC2cFNXpbLc1kk6tr0vndRYKlkMgFZ4Na5usJ2LVQ9QInDIpcpoeARTczSRqDBXB/wstaDKI1ODsO5+5Uy2lnm6JSh4X5xePG7Dp+xIcHQbfYJvwtgv7AdykC/jHh6H28fgubOFS39L7RskcMrslDUUp26wCckg24JcYWV6u6CGNszQREbgM5LFPk2qeh3AbHO52JrqcIg==; 5:giRxlg9vJRIVoIaUD9ZLlt0Kj+kWxiHEf4h7fFErflJe5Doo+bDX7MNo/d7GVGpNoYbg8CtxW5j0n6I/NjTmDShnfvT2qd5LTG8fLSUeIxnTZ0e/HCvfDm06URZoysUoNR19SmxGd6h2K/nFsaUf4g==; 24:0pI+/mOE/ePAlCd8h4NBy1nW0P4vssHEG0Mj5ol0cCGjmjYvmkENG2xhbEUIajtu7+Yl3jp7NaDV7XigriogRvkArL5pxW141ECYczG9iTY=; 7:pYl7q1lyW7lO/axHRyVe68fd8726AdwwSR+InLWxvhsyaznJ0NNh5u1IOCUbPCHMrBlw+XmwgHxPkwbP8vg9/5+znJy5G4STgNFyU8GOKrJWeQt2ZQ07a6uRJdbWssAY+Q+6qFKUwYPEld84gM3hazaTyrP/C39II2Nx70BemVWpJQMOkthQcXi930WyPphXRivZMXpQ69vEOM5B11utyq62zkRr43Oi7LCX7jjXayFHGro0tbLWuBI8/ggAGujkA2ltvL94oTT4DLAffYV1UQ/omx6ZXQhRZ3fQrN9fBAr0n0Onsq5/A/+lcFLWw/Xv SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR04MB1979; 20:LEfgl4Hobm7ED28rydjFZieVFDe5NZCva8xJMigCMZzuwnE0vJTEBQBxERMPnsSgHfXSFoHrtsJWPQ2Gf1TiXeeupUF3jN8jg3F5W6l+a3wBKT+zy8b0POY/RfUyzBNBh886SNEtHXMH41/Q8xdIU2L6w+4mLFx9dxr+knzh3/RgrxGtHub5ZzDzDPwIjanEb01WqGsnUxI4CCAbbk+q37E1lZcaXthAnsBKAiHZB3VebPfMk9+EGfr0UxoAcuoj X-OriginatorOrg: hgst.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2016 04:11:56.2240 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR04MB1979 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Hannes Reinecke Signed-off-by: Hannes Reinecke Signed-off-by: Damien Le Moal Reviewed-by: Christoph Hellwig Reviewed-by: Martin K. Petersen Reviewed-by: Shaun Tancheff Tested-by: Shaun Tancheff --- block/blk-settings.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/block/blk-settings.c b/block/blk-settings.c index b1d5b7f..55369a6 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -631,6 +631,10 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, t->discard_granularity; } + if (b->chunk_sectors) + t->chunk_sectors = min_not_zero(t->chunk_sectors, + b->chunk_sectors); + return ret; } EXPORT_SYMBOL(blk_stack_limits);