Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp5995301ybc; Wed, 27 Nov 2019 13:05:53 -0800 (PST) X-Google-Smtp-Source: APXvYqwbbwDPPsFqopYOmTiZQQo5fj0hcWMRBzbpt00VvJ0VxD1gtijx7EFm6zkFIT+2z3jNLtwu X-Received: by 2002:a05:6402:12ca:: with SMTP id k10mr34184834edx.255.1574888753526; Wed, 27 Nov 2019 13:05:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574888753; cv=none; d=google.com; s=arc-20160816; b=ZE51I4ciGisZ4dvXZvgoRIB3FuiMVae+PG+uVy78aIkl5XSShwGH356LZ5LQbYnn4H ErqN4PbCByQb+g4bs1gyckPShp05gqr9FwyEvC3+Z6f0zTOI3zl+5XA0vCPiv7il+G/C e4+uQYze+9o2vWpZrQBDiCHphiqtMYEv6I6yMt7apauDPgCnZV9Z64wTFe7beZwGe8qn lhCu6h2i9afvrLc3gJq/pGZ4aACILUq6UoFxk+4QvPQAMd/Y3Ksp24OVwf6vI2e1gjOq 8cYSIdyxLMy4GvhH5TDtGRbLbuqeqvSTQMOuIqlu5SZNqyblcEjAbNgRE80cJmPOKSKb kZ3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=g/2cQ3CxpAsB7+q2aJoGe9Z6yulTN7EvbNz+TlQ1EBI=; b=Eyk6oK78EktP//2Q4XFqCHBkdSPfGMmFruvN1M9PN0LlcfEe0bfNt3gl8xpV2r1DaK KXxD1txhW2jQlQsEI/eN2Ca/ZuxSUMHfxFnWftrP7BU1SDSviETdTXDNkTN4w9UPGVzm 4KuE5jtReml7sxvuZilQJdnIRmfMj69fTrWWBQHunX5OEiBtT3AUzr/RmkrN1KVJ/gqK nPV67xULn01p9p+AXhf7zPDlTJ2hh/O7ihwJAS/r2VtZ6F14cgygP+DEu5qaNkUBiX/R g4m3nhmp0h5tQu7KszNkCNFsMuzAKxk9EpA2kDPEP6OogSNfEpJDp52adtTdo0uzO1t8 vglg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=T2X+sYAB; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id me8si10349197ejb.382.2019.11.27.13.05.29; Wed, 27 Nov 2019 13:05:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=T2X+sYAB; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727444AbfK0VED (ORCPT + 99 others); Wed, 27 Nov 2019 16:04:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:57346 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732106AbfK0VEA (ORCPT ); Wed, 27 Nov 2019 16:04:00 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 41F01215A5; Wed, 27 Nov 2019 21:03:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574888639; bh=QvQ27XNzzcAgPS7U8JGTJIggurF2PvKbrINkZNsf99U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T2X+sYABJYhsQ0qu1LA59mEwj9eulIJA7PGeuinpNtVLYZ3R9W69DcPzbmm3CJNSu n+UL3lHPxVol6nlX5MMmxzej7Wq+Nl6TUzGdHmurpryha/fwHc/lIoY9k4/KirEUyA JQuEkmO+mP3DOuhC98n8UQsKL5/yzaq0ZgCbGugA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nikolay Borisov , Changbin Du , Arnd Bergmann , David Sterba , Sasha Levin Subject: [PATCH 4.19 212/306] btrfs: avoid link error with CONFIG_NO_AUTO_INLINE Date: Wed, 27 Nov 2019 21:31:02 +0100 Message-Id: <20191127203130.607067431@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127203114.766709977@linuxfoundation.org> References: <20191127203114.766709977@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann [ Upstream commit 7e17916b35797396f681a3270245fd29c1e4c250 ] Note: this patch fixes a problem in a feature outside of btrfs ("kernel hacking: add a config option to disable compiler auto-inlining") and is applied ahead of time due to cross-subsystem dependencies. On 32-bit ARM with gcc-8, I see a link error with the addition of the CONFIG_NO_AUTO_INLINE option: fs/btrfs/super.o: In function `btrfs_statfs': super.c:(.text+0x67b8): undefined reference to `__aeabi_uldivmod' super.c:(.text+0x67fc): undefined reference to `__aeabi_uldivmod' super.c:(.text+0x6858): undefined reference to `__aeabi_uldivmod' super.c:(.text+0x6920): undefined reference to `__aeabi_uldivmod' super.c:(.text+0x693c): undefined reference to `__aeabi_uldivmod' fs/btrfs/super.o:super.c:(.text+0x6958): more undefined references to `__aeabi_uldivmod' follow So far this is the only file that shows the behavior, so I'd propose to just work around it by marking the functions as 'static inline' that normally get inlined here. The reference to __aeabi_uldivmod comes from a div_u64() which has an optimization for a constant division that uses a straight '/' operator when the result should be known to the compiler. My interpretation is that as we turn off inlining, gcc still expects the result to be constant but fails to use that constant value. Link: https://lkml.kernel.org/r/20181103153941.1881966-1-arnd@arndb.de Reviewed-by: Nikolay Borisov Reviewed-by: Changbin Du Signed-off-by: Arnd Bergmann [ add the note ] Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/super.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 8888337a95b64..ddbad8d509490 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -1919,7 +1919,7 @@ static int btrfs_remount(struct super_block *sb, int *flags, char *data) } /* Used to sort the devices by max_avail(descending sort) */ -static int btrfs_cmp_device_free_bytes(const void *dev_info1, +static inline int btrfs_cmp_device_free_bytes(const void *dev_info1, const void *dev_info2) { if (((struct btrfs_device_info *)dev_info1)->max_avail > @@ -1948,8 +1948,8 @@ static inline void btrfs_descending_sort_devices( * The helper to calc the free space on the devices that can be used to store * file data. */ -static int btrfs_calc_avail_data_space(struct btrfs_fs_info *fs_info, - u64 *free_bytes) +static inline int btrfs_calc_avail_data_space(struct btrfs_fs_info *fs_info, + u64 *free_bytes) { struct btrfs_device_info *devices_info; struct btrfs_fs_devices *fs_devices = fs_info->fs_devices; -- 2.20.1