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 880901DF244; Tue, 29 Apr 2025 07:35:39 +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=1745912139; cv=none; b=bvcA4ivOGZUinIFLxJima+lVhAM2z9yQu7pV/43RY0eueC+O+kTrKrI7EnTLT0UtJpMr1s+VfxT147WJAacO2QhcpOcAsWo7jxt9MamWClBNSayMYHkMXoy8ry1fGSMbVFbvS6WMPPKhVBDqdr7B5IS+8HfsTfQCz5IzxmN7lRY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745912139; c=relaxed/simple; bh=kwzMyvOLO2TwmdjBY0qOKkXwcbCJEbUPFM7wP3n+zoI=; h=Subject:To:Cc:From:Date:In-Reply-To:Message-ID:MIME-Version: Content-Type; b=jnj+N3KN10qSZAAOwl4xFECXlCE2hHRRDu8BomQFQvrFsqIXm8/u67flH3aTBr3lxoQzvdkfRL2b0gC+wHWQ80M6qoS8XsfpeRwnfKwGJCO/9uxD8A1UcXitlaT8cz9JBRG5NeSTSK79Wmt1xYtyAuZqHIOaWsLspoTUUhgpqhI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=XYggucct; 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="XYggucct" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D3EC6C4CEE3; Tue, 29 Apr 2025 07:35:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745912139; bh=kwzMyvOLO2TwmdjBY0qOKkXwcbCJEbUPFM7wP3n+zoI=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=XYggucctPaov8Ji8S/GNc0LqHX7hdXPTuFUC0JDbV/SuVDMkA7SFyGnD7TdD1unzV +nc+JzV9R+7zJovGskTb80SighvNXL0BzOvNe68vWtMAqGIn5QnfQoS5Rj5AGWQkn+ K1xbITeHyzLTCRuvKBZUFHPnsl5F8d64+0devw7w= Subject: Patch "xfs: rename xfs_iomap_swapfile_activate to xfs_vm_swap_activate" has been added to the 6.12-stable tree To: cem@kernel.org,dchinner@redhat.com,djwong@kernel.org,gregkh@linuxfoundation.org,hch@lst.de,xfs-stable@lists.linux.dev Cc: From: Date: Tue, 29 Apr 2025 09:35:13 +0200 In-Reply-To: <174586545440.480536.11026423037943384392.stgit@frogsfrogsfrogs> Message-ID: <2025042913-preamble-wrongness-768a@gregkh> Precedence: bulk X-Mailing-List: xfs-stable@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit X-stable: commit X-Patchwork-Hint: ignore This is a note to let you know that I've just added the patch titled xfs: rename xfs_iomap_swapfile_activate to xfs_vm_swap_activate to the 6.12-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: xfs-rename-xfs_iomap_swapfile_activate-to-xfs_vm_swap_activate.patch and it can be found in the queue-6.12 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From stable+bounces-136940-greg=kroah.com@vger.kernel.org Mon Apr 28 20:39:56 2025 From: "Darrick J. Wong" Date: Mon, 28 Apr 2025 11:39:51 -0700 Subject: xfs: rename xfs_iomap_swapfile_activate to xfs_vm_swap_activate To: djwong@kernel.org, xfs-stable@lists.linux.dev Cc: cem@kernel.org, dchinner@redhat.com, hch@lst.de, stable@vger.kernel.org Message-ID: <174586545440.480536.11026423037943384392.stgit@frogsfrogsfrogs> From: Christoph Hellwig Commit 3cd6a8056f5a2e794c42fc2114ee2611e358b357 upstream Match the method name and the naming convention or address_space operations. Signed-off-by: Christoph Hellwig Reviewed-by: Darrick J. Wong Reviewed-by: Dave Chinner Signed-off-by: Carlos Maiolino Signed-off-by: Greg Kroah-Hartman --- fs/xfs/xfs_aops.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -528,7 +528,7 @@ xfs_vm_readahead( } static int -xfs_iomap_swapfile_activate( +xfs_vm_swap_activate( struct swap_info_struct *sis, struct file *swap_file, sector_t *span) @@ -549,11 +549,11 @@ const struct address_space_operations xf .migrate_folio = filemap_migrate_folio, .is_partially_uptodate = iomap_is_partially_uptodate, .error_remove_folio = generic_error_remove_folio, - .swap_activate = xfs_iomap_swapfile_activate, + .swap_activate = xfs_vm_swap_activate, }; const struct address_space_operations xfs_dax_aops = { .writepages = xfs_dax_writepages, .dirty_folio = noop_dirty_folio, - .swap_activate = xfs_iomap_swapfile_activate, + .swap_activate = xfs_vm_swap_activate, }; Patches currently in stable-queue which might be from djwong@kernel.org are queue-6.12/xfs-do-not-check-needsrepair-if-ro-norecovery-mount.patch queue-6.12/xfs-do-not-allow-norecovery-mount-with-quotacheck.patch queue-6.12/iomap-skip-unnecessary-ifs_block_is_uptodate-check.patch queue-6.12/xfs-flush-inodegc-before-swapon.patch queue-6.12/xfs-rename-xfs_iomap_swapfile_activate-to-xfs_vm_swap_activate.patch