From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6013A145336; Thu, 13 Jun 2024 11:55:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718279726; cv=none; b=RtJYsmqVsRJ8QtzNf0reAkBsykuzdg5Yy2G/5t0dt5nUbLi9zHv/F0wIbGaKdkRy/Ag8gHvubS0rHhRw8WbT0iYlJhI+LWMvy9YfZHx4kAxKiPTBv26l0ODluzCatggFq2jgKfpHfwKle1SheAWfRBv2EWuJBOEAJ6+XhMeqXGE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718279726; c=relaxed/simple; bh=Ebyfr11FtB4bu5arTO1Xpofd758WxTPVSFCHTfRZic8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=plWMLYxJUSKIv2bZkF5pTRlap9t1Rha9iIbSk/r7vg6z/lc/IM4Ty7yCUDY+YJYRpcdwUA1gfi1OJ8wHbl/AT8vuZe/hAyqlJyz/ZlGNCu9YuwIm47d+ShvF7z4vCD8n/4fdV2pWYs2TL8/UXz1CPoSKuW0qcsVVwI3LMCSSTbk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=MVxnGmMx; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="MVxnGmMx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF7C5C2BBFC; Thu, 13 Jun 2024 11:55:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1718279726; bh=Ebyfr11FtB4bu5arTO1Xpofd758WxTPVSFCHTfRZic8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MVxnGmMx+M6fI2jd1xdoTn62bX31aFWeWc7nUpWWp27Fk8A1YnS6KKZnPuzdc/btg 9AAtCIe2sfUBioSCKKvN0oD3Uj8NB6d7zO9Ted90fJ/EL+f0jTiYe7psWewDL5htju 9lgkkxR+yiF3WyFyJquYnHCwe85xQghbKFm3qlsA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Eric Sandeen , Christian Brauner , Sasha Levin Subject: [PATCH 5.4 016/202] openpromfs: finish conversion to the new mount API Date: Thu, 13 Jun 2024 13:31:54 +0200 Message-ID: <20240613113228.391005831@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240613113227.759341286@linuxfoundation.org> References: <20240613113227.759341286@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Sandeen [ Upstream commit 8f27829974b025d4df2e78894105d75e3bf349f0 ] The original mount API conversion inexplicably left out the change from ->remount_fs to ->reconfigure; do that now. Fixes: 7ab2fa7693c3 ("vfs: Convert openpromfs to use the new mount API") Signed-off-by: Eric Sandeen Link: https://lore.kernel.org/r/90b968aa-c979-420f-ba37-5acc3391b28f@redhat.com Signed-off-by: Christian Brauner Signed-off-by: Sasha Levin --- fs/openpromfs/inode.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/openpromfs/inode.c b/fs/openpromfs/inode.c index 40c8c2e32fa3e..1e22344be5e54 100644 --- a/fs/openpromfs/inode.c +++ b/fs/openpromfs/inode.c @@ -362,10 +362,10 @@ static struct inode *openprom_iget(struct super_block *sb, ino_t ino) return inode; } -static int openprom_remount(struct super_block *sb, int *flags, char *data) +static int openpromfs_reconfigure(struct fs_context *fc) { - sync_filesystem(sb); - *flags |= SB_NOATIME; + sync_filesystem(fc->root->d_sb); + fc->sb_flags |= SB_NOATIME; return 0; } @@ -373,7 +373,6 @@ static const struct super_operations openprom_sops = { .alloc_inode = openprom_alloc_inode, .free_inode = openprom_free_inode, .statfs = simple_statfs, - .remount_fs = openprom_remount, }; static int openprom_fill_super(struct super_block *s, struct fs_context *fc) @@ -417,6 +416,7 @@ static int openpromfs_get_tree(struct fs_context *fc) static const struct fs_context_operations openpromfs_context_ops = { .get_tree = openpromfs_get_tree, + .reconfigure = openpromfs_reconfigure, }; static int openpromfs_init_fs_context(struct fs_context *fc) -- 2.43.0