From patchwork Wed Aug 30 23:44:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Chinner X-Patchwork-Id: 9930989 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 7762D6032A for ; Wed, 30 Aug 2017 23:44:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6984C287E8 for ; Wed, 30 Aug 2017 23:44:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5E709287EA; Wed, 30 Aug 2017 23:44:52 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 C226D287E8 for ; Wed, 30 Aug 2017 23:44:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751242AbdH3Xov (ORCPT ); Wed, 30 Aug 2017 19:44:51 -0400 Received: from ipmail06.adl6.internode.on.net ([150.101.137.145]:24755 "EHLO ipmail06.adl6.internode.on.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751205AbdH3Xou (ORCPT ); Wed, 30 Aug 2017 19:44:50 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2AAAgA4TadZ//yBpzteGgEBAQECAQEBAQgBAQEBhVOPCo9mAQEBAQEGgSqNGIshhUECAgEBAoR+AQIBAQEBAQJrKIUYAQEBAQMnExwzCAMVAwklDwUlAzSKJAyvUzqLRAELJiCDCoMJhVKFQYJ3gjEFkSWHCYg+lD+SeJZDV4ENMiEIHBWHdi42iEkrghQBAQE Received: from ppp59-167-129-252.static.internode.on.net (HELO dastard) ([59.167.129.252]) by ipmail06.adl6.internode.on.net with ESMTP; 31 Aug 2017 09:14:48 +0930 Received: from dave by dastard with local (Exim 4.80) (envelope-from ) id 1dnCf9-0004LW-OC for linux-xfs@vger.kernel.org; Thu, 31 Aug 2017 09:44:47 +1000 Date: Thu, 31 Aug 2017 09:44:47 +1000 From: Dave Chinner To: linux-xfs@vger.kernel.org Subject: Re: [PATCH 36/42] mkfs: factor AG alignment Message-ID: <20170830234447.GF17782@dastard> References: <20170829235052.21050-1-david@fromorbit.com> <20170829235052.21050-37-david@fromorbit.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20170829235052.21050-37-david@fromorbit.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Wed, Aug 30, 2017 at 09:50:46AM +1000, Dave Chinner wrote: > From: Dave Chinner .... This patch needs this delta fix, otherwise large filesystems will be configured wrongly. Cheers, Dave. diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index bec12d473099..21394a1ae946 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -2707,7 +2707,7 @@ align_ag_geometry( int dsunit = cfg->dsunit; if (!dsunit) - return; + goto validate; /* * agsize is not a multiple of dsunit @@ -2791,6 +2791,7 @@ an AG size that is one stripe unit smaller or larger, for example %llu.\n"), (cfg->dblocks % cfg->agsize != 0); } +validate: /* * If the last AG is too small, reduce the filesystem size * and drop the blocks. @@ -2803,7 +2804,6 @@ an AG size that is one stripe unit smaller or larger, for example %llu.\n"), ASSERT(cfg->agcount != 0); } -validate: validate_ag_geometry(cfg->blocklog, cfg->dblocks, cfg->agsize, cfg->agcount); }