From patchwork Tue Oct 31 01:07:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 159913 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp2607223vqb; Mon, 30 Oct 2023 18:07:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEaz3GIgPRwx5O+J+r1AqeSvfzX9htxyGGp6Lu4WAr5zBZUjCSoc24AkKz17bzLsV2RUJTx X-Received: by 2002:a17:902:e890:b0:1cc:5691:5112 with SMTP id w16-20020a170902e89000b001cc56915112mr3331543plg.7.1698714476827; Mon, 30 Oct 2023 18:07:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698714476; cv=none; d=google.com; s=arc-20160816; b=RbiI9kb5soYybPL+bf/V0bLNHySKmZ2uhUl1eNBP/wiaOw9j8HUETel5mA/xVh8egS PcHxrCYIoxwLGnl5NkadSpDLApL4Xz+FMn6xO6c18AdpHGm3FG9tRViGo+C8yz/vhYKD KpztJ20cKMK3M9N9JeHszvB0ET2YL6GAQYZ9w0PLLiqM0zJw66MLuyO5V3Y6CYc7dHX6 3LcSGGIloeA1nG1LkJmj6IxCAAdkcAarXwANjPIW88jluhQFHjtBzAujBmmkSZS4+e7T /rWDjtzUys0oe3JxZsVnJh/WmJkaU/U5pn4BS4gZSZZrs08GK8CTUrrF5ZBz84S0Kyc0 UMNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=0r7f7aeoGlM17q0fwDD24z5RdolX82nJaIK2/epUJ/Y=; fh=IfaN8RqJV+WgQh20Xjig9Jefjjq8Xxv1hvEQ7w5aE18=; b=dTYshXS2lKAUK2JSS8eK/ikH83ZX4Mk4+i7SX+S2MBMpIHbQ43hegB1s127EV+vkqu Dnx1zAuSepnUvIMQ9VXunDOMTRsiehN/zwll7zCg0SApXV6HmYW4Tvmm9TkN7YRswQ3D q9rwKC1BonQ6yf73gg3MUHjCDDAOTBngfJwUSepYTnqGCUg7bBTTDVx5WzszgPZduy54 UXZspbNMsh6QPbWIzCqo+CBJyK8DzwU2UcNIRy5DTThQd0diAjrGxc38fLV+W4mEMCz0 VvdwA7qy6zgVJl75ngVZeBvnFCP/TtKwN1Tp6JTk0lq7Yhn0cJsZ+EB3S7W0ItJ4BCoS JBmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Jd5+0vsZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id lh11-20020a170903290b00b001b973681493si212825plb.16.2023.10.30.18.07.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Oct 2023 18:07:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Jd5+0vsZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 28899802AF3A; Mon, 30 Oct 2023 18:07:56 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236331AbjJaBHw (ORCPT + 33 others); Mon, 30 Oct 2023 21:07:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230376AbjJaBHv (ORCPT ); Mon, 30 Oct 2023 21:07:51 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95AB1CC; Mon, 30 Oct 2023 18:07:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1698714466; bh=0r7f7aeoGlM17q0fwDD24z5RdolX82nJaIK2/epUJ/Y=; h=Date:From:To:Cc:Subject:From; b=Jd5+0vsZAanmX0S9y84cXsrpqlJUPbfg3RtqlkreDarQ4uL9QAh2NOabE1XJS2tsL fvB82QSX6gbPULIUZzTcURlKIJ8eMP4q0jkrrLDDhg1u6W4ZjeLQSz3UGoE/UlZjQa z5sRpWBqHpeDXZ50iAo5sjJ/f3aRJH9iwR7x4RnwAbQ6AzhX7L+cre4fY24bh54ijt wlkvGHpOwXb49yqC5fCsJSKNhrvjoDC08ndAlKH+aJjdq5DTg+jLlQx4hxz2D1ZXYC MsWhliIV5gpp9LtZll7Y7RDhEgmDMJpH4ATokLelf+a/R08Ecr9HJ16gesu56O4BQU r4VWbJWbxfIsQ== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4SKBnt50cVz4wdD; Tue, 31 Oct 2023 12:07:46 +1100 (AEDT) Date: Tue, 31 Oct 2023 12:07:45 +1100 From: Stephen Rothwell To: Christian Brauner , Kent Overstreet Cc: Kent Overstreet , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the vfs-brauner tree Message-ID: <20231031120745.5d01f1a2@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 30 Oct 2023 18:07:56 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781231231105186365 X-GMAIL-MSGID: 1781231231105186365 Hi all, After merging the vfs-brauner tree, today's linux-next build (x86_64 allmodconfig) failed like this: fs/bcachefs/fs-ioctl.c: In function 'bch2_ioc_goingdown': fs/bcachefs/fs-ioctl.c:294:23: error: implicit declaration of function 'freeze_bdev' [-Werror=implicit-function-declaration] 294 | ret = freeze_bdev(c->vfs_sb->s_bdev); | ^~~~~~~~~~~ fs/bcachefs/fs-ioctl.c:301:17: error: implicit declaration of function 'thaw_bdev' [-Werror=implicit-function-declaration] 301 | thaw_bdev(c->vfs_sb->s_bdev); | ^~~~~~~~~ Caused by commit 46bb2e011760 ("bdev: rename freeze and thaw helpers") interacting with commit 4495cbed568b ("bcachefs: Improve FS_IOC_GOINGDOWN ioctl") I have applied the following merge resolution patch for today. From: Stephen Rothwell Date: Tue, 31 Oct 2023 12:00:27 +1100 Subject: [PATCH] fixup for "bdev: rename freeze and thaw helpers" interacting with "bcachefs: Improve FS_IOC_GOINGDOWN ioctl". Signed-off-by: Stephen Rothwell --- fs/bcachefs/fs-ioctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/bcachefs/fs-ioctl.c b/fs/bcachefs/fs-ioctl.c index 6040bd3f0778..d715a2b35189 100644 --- a/fs/bcachefs/fs-ioctl.c +++ b/fs/bcachefs/fs-ioctl.c @@ -291,14 +291,14 @@ static int bch2_ioc_goingdown(struct bch_fs *c, u32 __user *arg) switch (flags) { case FSOP_GOING_FLAGS_DEFAULT: - ret = freeze_bdev(c->vfs_sb->s_bdev); + ret = bdev_freeze(c->vfs_sb->s_bdev); if (ret) goto err; bch2_journal_flush(&c->journal); c->vfs_sb->s_flags |= SB_RDONLY; bch2_fs_emergency_read_only(c); - thaw_bdev(c->vfs_sb->s_bdev); + bdev_thaw(c->vfs_sb->s_bdev); break; case FSOP_GOING_FLAGS_LOGFLUSH: