)]}'
{
  "commit": "c4fcdba2d32933938b008b72e53252ddc6286367",
  "tree": "4b717c0ce83bd7bb74e2e7c4bd58d9accf047d32",
  "parents": [
    "4675a9ab3fb0439f354a6a0b3f3c8cf690d5dcd7"
  ],
  "author": {
    "name": "Darrick J. Wong",
    "email": "djwong@kernel.org",
    "time": "Mon Jul 13 23:03:44 2026 -0700"
  },
  "committer": {
    "name": "Cloud Image Release",
    "email": "cloud-image-release@prod.google.com",
    "time": "Fri Jul 17 12:04:45 2026 -0700"
  },
  "message": "xfs: resample the data fork mapping after cycling ILOCK\n\nConflicts:\n\tfs/xfs/xfs_reflink.c - The variables around seq_before in\n\txfs_reflink_fill_cow_hole are slightly different. We adjust the\n\tpatch so that it still just adds the seq_before declaration.\n\n[ Upstream commit 2f4acd0fcd862e22eab45690ec2c08c80b6ef2e7 ]\n\nxfs_reflink_fill_{cow_hole,delalloc} are both presented with an inode,\na data fork mapping, and a cow fork mapping.  Unfortunately, these two\nhelpers cycle the ILOCK to grab a transaction, which means that the\nmappings are stale as soon as we reacquire the ILOCK.  Currently we\nrefresh the cow fork mapping by re-calling xfs_find_trim_cow_extent, but\nwe don\u0027t refresh the data fork mapping beforehand, which means that the\nxfs_bmap_trim_cow in that function queries the refcount btree about the\nwrong physical blocks and returns an inaccurate value in *shared.\n\nIf *shared is now false, the directio write proceeds with a stale data\nfork mapping.  Fix this by querying the data fork mapping if the\nsequence counter changes across the ILOCK cycle.\n\nBUG\u003db/535631885\nTEST\u003dpresubmit, compile\nRELEASE_NOTE\u003dFixed an important bug for xfs file system users.\n\ncos-patch: bug\nFixes: 3c68d44a2b49a0 (\"xfs: allocate direct I/O COW blocks in iomap_begin\")\nSigned-off-by: Kevin Berry \u003ckpberry@google.com\u003e\nChange-Id: If6c9c2c82fba19110a2f610e11d2ad9c3cd51bc6\nReviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/169925\nTested-by: Cusky Presubmit Bot \u003cpresubmit@cos-infra-prod.iam.gserviceaccount.com\u003e\nMain-Branch-Verified: Cusky Presubmit Bot \u003cpresubmit@cos-infra-prod.iam.gserviceaccount.com\u003e\nReviewed-by: Robert Kolchmeyer \u003crkolchmeyer@google.com\u003e\nReviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/170124\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "4058cf361d2153cc7adc4d919754b4e9ac37c2a1",
      "old_mode": 33188,
      "old_path": "fs/xfs/xfs_reflink.c",
      "new_id": "23d1650aee482ca3b1a34d06e19875774b698b7b",
      "new_mode": 33188,
      "new_path": "fs/xfs/xfs_reflink.c"
    }
  ]
}