public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org
Cc: Leah Rumancik <leah.rumancik@gmail.com>, Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH 6.1 11/19] xfs: abort intent items when recovery intents fail
Date: Sat,  1 Feb 2025 18:53:50 -0500	[thread overview]
Message-ID: <20250201142300-0efffe3154bfd67e@stable.kernel.org> (raw)
In-Reply-To: <20250129184717.80816-12-leah.rumancik@gmail.com>

[ Sasha's backport helper bot ]

Hi,

The upstream commit SHA1 provided is correct: f8f9d952e42dd49ae534f61f2fa7ca0876cb9848

WARNING: Author mismatch between patch and upstream commit:
Backport author: Leah Rumancik<leah.rumancik@gmail.com>
Commit author: Long Li<leo.lilong@huawei.com>


Status in newer kernel trees:
6.13.y | Present (exact SHA1)
6.12.y | Present (exact SHA1)
6.6.y | Present (different SHA1: 005be6684225)
6.1.y | Present (different SHA1: 6beaebf68934)

Note: The patch differs from the upstream commit:
---
1:  f8f9d952e42dd ! 1:  7e1e53b9da92c xfs: abort intent items when recovery intents fail
    @@ Metadata
      ## Commit message ##
         xfs: abort intent items when recovery intents fail
     
    +    [ Upstream commit f8f9d952e42dd49ae534f61f2fa7ca0876cb9848 ]
    +
         When recovering intents, we capture newly created intent items as part of
         committing recovered intent items.  If intent recovery fails at a later
         point, we forget to remove those newly created intent items from the AIL
    @@ Commit message
         Signed-off-by: Long Li <leo.lilong@huawei.com>
         Reviewed-by: Darrick J. Wong <djwong@kernel.org>
         Signed-off-by: Chandan Babu R <chandanbabu@kernel.org>
    +    Signed-off-by: Leah Rumancik <leah.rumancik@gmail.com>
     
      ## fs/xfs/libxfs/xfs_defer.c ##
     @@ fs/xfs/libxfs/xfs_defer.c: xfs_defer_ops_capture(
---

Results of testing on various branches:

| Branch                    | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.1.y        |  Success    |  Success   |

  reply	other threads:[~2025-02-01 23:53 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-29 18:46 [PATCH 6.1 00/19] xfs 6.1.y fixes from 6.7 Leah Rumancik
2025-01-29 18:46 ` [PATCH 6.1 01/19] xfs: bump max fsgeom struct version Leah Rumancik
2025-02-01 23:54   ` Sasha Levin
2025-01-29 18:47 ` [PATCH 6.1 02/19] xfs: hoist freeing of rt data fork extent mappings Leah Rumancik
2025-02-01 23:53   ` Sasha Levin
2025-01-29 18:47 ` [PATCH 6.1 03/19] xfs: prevent rt growfs when quota is enabled Leah Rumancik
2025-02-01 23:53   ` Sasha Levin
2025-01-29 18:47 ` [PATCH 6.1 04/19] xfs: rt stubs should return negative errnos when rt disabled Leah Rumancik
2025-02-01 23:53   ` Sasha Levin
2025-01-29 18:47 ` [PATCH 6.1 05/19] xfs: fix units conversion error in xfs_bmap_del_extent_delay Leah Rumancik
2025-02-01 23:53   ` Sasha Levin
2025-01-29 18:47 ` [PATCH 6.1 06/19] xfs: make sure maxlen is still congruent with prod when rounding down Leah Rumancik
2025-02-01 23:54   ` Sasha Levin
2025-01-29 18:47 ` [PATCH 6.1 07/19] xfs: introduce protection for drop nlink Leah Rumancik
2025-02-01 23:53   ` Sasha Levin
2025-01-29 18:47 ` [PATCH 6.1 08/19] xfs: handle nimaps=0 from xfs_bmapi_write in xfs_alloc_file_space Leah Rumancik
2025-02-01 23:54   ` Sasha Levin
2025-01-29 18:47 ` [PATCH 6.1 09/19] xfs: allow read IO and FICLONE to run concurrently Leah Rumancik
2025-02-01 23:53   ` Sasha Levin
2025-01-29 18:47 ` [PATCH 6.1 10/19] xfs: factor out xfs_defer_pending_abort Leah Rumancik
2025-02-01 23:54   ` Sasha Levin
2025-01-29 18:47 ` [PATCH 6.1 11/19] xfs: abort intent items when recovery intents fail Leah Rumancik
2025-02-01 23:53   ` Sasha Levin [this message]
2025-01-29 18:47 ` [PATCH 6.1 12/19] xfs: only remap the written blocks in xfs_reflink_end_cow_extent Leah Rumancik
2025-02-01 23:53   ` Sasha Levin
2025-01-29 18:47 ` [PATCH 6.1 13/19] xfs: up(ic_sema) if flushing data device fails Leah Rumancik
2025-02-01 23:54   ` Sasha Levin
2025-01-29 18:47 ` [PATCH 6.1 14/19] xfs: fix internal error from AGFL exhaustion Leah Rumancik
2025-02-01 23:54   ` Sasha Levin
2025-01-29 18:47 ` [PATCH 6.1 15/19] xfs: inode recovery does not validate the recovered inode Leah Rumancik
2025-02-01 23:53   ` Sasha Levin
2025-01-29 18:47 ` [PATCH 6.1 16/19] xfs: clean up dqblk extraction Leah Rumancik
2025-02-01 23:53   ` Sasha Levin
2025-01-29 18:47 ` [PATCH 6.1 17/19] xfs: dquot recovery does not validate the recovered dquot Leah Rumancik
2025-02-01 23:53   ` Sasha Levin
2025-01-29 18:47 ` [PATCH 6.1 18/19] xfs: clean up FS_XFLAG_REALTIME handling in xfs_ioctl_setattr_xflags Leah Rumancik
2025-02-01 23:53   ` Sasha Levin
2025-01-29 18:47 ` [PATCH 6.1 19/19] xfs: respect the stable writes flag on the RT device Leah Rumancik
2025-02-01 23:53   ` Sasha Levin
2025-01-30  8:41 ` [PATCH 6.1 00/19] xfs 6.1.y fixes from 6.7 Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250201142300-0efffe3154bfd67e@stable.kernel.org \
    --to=sashal@kernel.org \
    --cc=leah.rumancik@gmail.com \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox