From patchwork Tue Mar 26 17:18:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 10871699 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 31D9F1669 for ; Tue, 26 Mar 2019 17:18:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1ADBE28B79 for ; Tue, 26 Mar 2019 17:18:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0E9B228B8A; Tue, 26 Mar 2019 17:18:26 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY 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 01AE028B66 for ; Tue, 26 Mar 2019 17:18:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726175AbfCZRSY (ORCPT ); Tue, 26 Mar 2019 13:18:24 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:45636 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728314AbfCZRSY (ORCPT ); Tue, 26 Mar 2019 13:18:24 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x2QHEXAm034351; Tue, 26 Mar 2019 17:18:21 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=corp-2018-07-02; bh=U40QSwDjonhLVUHdt7ExZXAl98csQrH3WqqZbMQdQqw=; b=cNAKrnWW8NWAdjmh4+fh8d49hG1XjmDnYed8EE1dmddxNOWz0sJ/gWm1X6TQkxyYLGkA O3tOxtdGXbFPgumhqMtjnXkM6ofU96z9DSmBM6qGSQcLTcLwflehajS8DE9x1Nr13wdw B0PlaAjnzGOAyMnFcRFGtjZNAVMcDdHQDcGzc+V4/xO3LO5BiHQhnPBfWhUJNL9aLJb6 R7COP3FBJzoQhhnGtCNYzojrz2wW87HiCHaVbKzDeMVwtTLqogLYCld7FnWwLUuHfsVO 2uiTMQ+UT7GqRJKaeW4+tLB0l808O+ehHdSgpRkvOsImBS3a+f2h1r9oI+BkFa1NsxC9 7w== Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp2130.oracle.com with ESMTP id 2re6g13tsn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 26 Mar 2019 17:18:21 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id x2QHILP2008126 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 26 Mar 2019 17:18:21 GMT Received: from abhmp0003.oracle.com (abhmp0003.oracle.com [141.146.116.9]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x2QHIK73018048; Tue, 26 Mar 2019 17:18:21 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 26 Mar 2019 10:18:20 -0700 Date: Tue, 26 Mar 2019 10:18:19 -0700 From: "Darrick J. Wong" To: sandeen@sandeen.net Cc: linux-xfs@vger.kernel.org Subject: [PATCH 48/36] mkfs: don't use DIFLAG values for fsx_xflags Message-ID: <20190326171819.GW1183@magnolia> References: <155259742281.31886.17157720770696604377.stgit@magnolia> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <155259742281.31886.17157720770696604377.stgit@magnolia> User-Agent: Mutt/1.9.4 (2018-02-28) X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9207 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=723 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1903260120 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 From: Darrick J. Wong mkfs shouldn't be using DIFLAG values where FS_XFLAG values are required. Signed-off-by: Darrick J. Wong Reviewed-by: Eric Sandeen --- mkfs/xfs_mkfs.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index e87c692c..19ad1c90 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -1451,15 +1451,15 @@ data_opts_parser( break; case D_RTINHERIT: if (getnum(value, opts, subopt)) - cli->fsx.fsx_xflags |= XFS_DIFLAG_RTINHERIT; + cli->fsx.fsx_xflags |= FS_XFLAG_RTINHERIT; break; case D_PROJINHERIT: cli->fsx.fsx_projid = getnum(value, opts, subopt); - cli->fsx.fsx_xflags |= XFS_DIFLAG_PROJINHERIT; + cli->fsx.fsx_xflags |= FS_XFLAG_PROJINHERIT; break; case D_EXTSZINHERIT: cli->fsx.fsx_extsize = getnum(value, opts, subopt); - cli->fsx.fsx_xflags |= XFS_DIFLAG_EXTSZINHERIT; + cli->fsx.fsx_xflags |= FS_XFLAG_EXTSZINHERIT; break; case D_COWEXTSIZE: cli->fsx.fsx_cowextsize = getnum(value, opts, subopt); @@ -2212,9 +2212,9 @@ validate_extsize_hint( bool rt; uint16_t flags = 0; - rt = (cli->fsx.fsx_xflags & XFS_DIFLAG_RTINHERIT); + rt = (cli->fsx.fsx_xflags & FS_XFLAG_RTINHERIT); - if (cli->fsx.fsx_xflags & XFS_DIFLAG_EXTSZINHERIT) + if (cli->fsx.fsx_xflags & FS_XFLAG_EXTSZINHERIT) flags |= XFS_DIFLAG_EXTSIZE; fa = libxfs_inode_validate_extsize(mp, cli->fsx.fsx_extsize, S_IFREG,