Message ID | 163158732017.1604118.6704125945588625133.stgit@magnolia (mailing list archive) |
---|---|
State | Accepted |
Headers | show
Return-Path: <linux-xfs-owner@kernel.org> X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5A645C433F5 for <linux-xfs@archiver.kernel.org>; Tue, 14 Sep 2021 02:42:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 37FD9610D1 for <linux-xfs@archiver.kernel.org>; Tue, 14 Sep 2021 02:42:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237467AbhINCnR (ORCPT <rfc822;linux-xfs@archiver.kernel.org>); Mon, 13 Sep 2021 22:43:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:53532 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237098AbhINCnR (ORCPT <rfc822;linux-xfs@vger.kernel.org>); Mon, 13 Sep 2021 22:43:17 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 68BD9610D1; Tue, 14 Sep 2021 02:42:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631587320; bh=87rFHsW5ysEHoN9qLTfflJIMTUC4ESrfLPfJjo/5NZk=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=FmmvBKzoFYpcSjKOrg0xOhTw0DAmcWK2M0u+L5ISRehtiK41JTUgYmEf8HVZ0R+/V wdzCF0pBjGgSs8n/HscUJOQc75mQt+lt761FmRZxihA4yvoARY2QFwZ/vbN1Pgm+V1 vw8QTcu4/RFtHofd/Be09CD8EkoWIio/EY1h2DKVy7kuKBFlP26yT/1RdgXk4dSZDH X0ctmUxj6ikuRmalDunNr+hx9UKbGMdTZ7DOK2Poo1lat413/zySZDfU7u50uFlxCX ZlbxgVLdU4RZisEg/BaPcHlsvyBoSXjsqsT0vcoqmrG0q5BjdzRFQPWM+cGqO8SBwh 5w3kLwdOr+FTA== Subject: [PATCH 22/43] xfs: rework attr2 feature and mount options From: "Darrick J. Wong" <djwong@kernel.org> To: sandeen@sandeen.net, djwong@kernel.org Cc: Dave Chinner <dchinner@redhat.com>, linux-xfs@vger.kernel.org Date: Mon, 13 Sep 2021 19:42:00 -0700 Message-ID: <163158732017.1604118.6704125945588625133.stgit@magnolia> In-Reply-To: <163158719952.1604118.14415288328687941574.stgit@magnolia> References: <163158719952.1604118.14415288328687941574.stgit@magnolia> User-Agent: StGit/0.19 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: <linux-xfs.vger.kernel.org> X-Mailing-List: linux-xfs@vger.kernel.org |
Series |
xfs: sync libxfs with 5.15
|
expand
|
diff --git a/libxfs/xfs_format.h b/libxfs/xfs_format.h index 5d8a1291..ac739e6a 100644 --- a/libxfs/xfs_format.h +++ b/libxfs/xfs_format.h @@ -398,13 +398,6 @@ static inline void xfs_sb_version_addattr2(struct xfs_sb *sbp) sbp->sb_features2 |= XFS_SB_VERSION2_ATTR2BIT; } -static inline void xfs_sb_version_removeattr2(struct xfs_sb *sbp) -{ - sbp->sb_features2 &= ~XFS_SB_VERSION2_ATTR2BIT; - if (!sbp->sb_features2) - sbp->sb_versionnum &= ~XFS_SB_VERSION_MOREBITSBIT; -} - static inline bool xfs_sb_version_hasprojid32bit(struct xfs_sb *sbp) { return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5) ||