RE: [PATCH v2 00/15] ceph: add binary logging (BLOG) for CephFS

Viacheslav Dubeyko <[email protected]> Tue, 7 Jul 2026 18:45:39 +0000
Newsgroups org.kernel.vger.ceph-devel
Message-ID <[email protected]>
On Tue, 2026-07-07 at 13:42 +0000, Alex Markuze wrote:
> Hi Slava,
> 
> The series is based on ceph-client/testing, not mainline. Patch 9/15
> touches mds_client.c which has several patches in testing that haven't
> gone upstream yet, so it won't apply to 7.2-rc2.
> 
> To apply:
> 
>   git clone https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_ceph_ceph-2Dclient.git&d=DwIDaQ&c=BSDicqBQBDjDI9RkVyTcHQ&r=q5bIm4AXMzc8NJu1_RGmnQ2fMWKq4Y4RAkElvUgSs00&m=eB41jErksdycZGZ6ZgiVAnbRJ9VxcBqdMv5ygPsxEKdmF7NNtZ_xDzspYaVC_bb5&s=HH-8WDyhiNePrmCfyD3NjrU9xC-bGyPH6cLNgr9kU0E&e=  -b testing
>   b4 shazam <msgid>
> 
> or just pull ceph-client/testing directly — the series applies clean
> there.
> 

I cannot apply the patchset cleanly on ceph-client/testing too:

b4 shazam
https://lore.kernel.org/ceph-devel/[email protected]/T/#t
Grabbing thread from
lore.kernel.org/all/[email protected]/t.mbox.gz
Checking for newer revisions
Grabbing search results from lore.kernel.org
Analyzing 18 messages in the thread
Looking for additional code-review trailers on lore.kernel.org
Analyzing 16 code-review messages
Checking attestation on all messages, may take a moment...
---
  ✓ [PATCH v2 1/15] ceph: add BLOG public headers
  ✓ [PATCH v2 2/15] ceph: add BLOG deserialization support
  ✓ [PATCH v2 3/15] ceph: add BLOG page-fragment allocator
  ✓ [PATCH v2 4/15] ceph: add BLOG magazine batch allocator
  ✓ [PATCH v2 5/15] ceph: add BLOG logger core
  ✓ [PATCH v2 6/15] ceph: add BLOG per-module context management
  ✓ [PATCH v2 7/15] ceph: add Ceph BLOG scaffolding
  ✓ [PATCH v2 8/15] ceph: add bout and boutc wrappers for BLOG
  ✓ [PATCH v2 9/15] ceph: switch MDS request plumbing to struct
ceph_journal_info
  ✓ [PATCH v2 10/15] ceph: add BLOG debugfs interface
  ✓ [PATCH v2 11/15] ceph: convert VFS inode and directory paths to bout
  ✓ [PATCH v2 12/15] ceph: convert VFS data I/O paths to bout
  ✓ [PATCH v2 13/15] ceph: convert capability and snapshot paths to bout
  ✓ [PATCH v2 14/15] ceph: convert remaining helper paths to bout
  ✓ [PATCH v2 15/15] selftests: add Ceph BLOG smoke test and collection helpers
  ---
  ✓ Signed: DKIM/redhat.com
---
Total patches: 15
---
Applying: ceph: add BLOG public headers
Applying: ceph: add BLOG deserialization support
Applying: ceph: add BLOG page-fragment allocator
Applying: ceph: add BLOG magazine batch allocator
Applying: ceph: add BLOG logger core
Applying: ceph: add BLOG per-module context management
Applying: ceph: add Ceph BLOG scaffolding
Applying: ceph: add bout and boutc wrappers for BLOG
Applying: ceph: switch MDS request plumbing to struct ceph_journal_info
Applying: ceph: add BLOG debugfs interface
Applying: ceph: convert VFS inode and directory paths to bout
Patch failed at 0011 ceph: convert VFS inode and directory paths to bout
error: patch failed: fs/ceph/dir.c:546
error: fs/ceph/dir.c: patch does not apply
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

Probably, some recent patches in ceph-client/testing prevents from clean
applying.

Thanks,
Slava.