Skip to content

smb: client: fix i_blocks accounting for swapfile xfstests

Huiwen He linux-cifs 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest3 patches 4 repliesIn review
  2. v13 patches 0 repliesSuperseded

Changes in v2 from the cover letter

- Patch 1 was updated to cover more CIFS write paths and to use common helpers for local i_blocks accounting.
- Patches 2 and 3 are unchanged.

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3smb/client: update i_blocks after contiguous writesfs/smb/client/cifsfs.c fs/smb/client/cifsfs.h fs/smb/client/cifsglob.h +1 more+61 -50 replies
2/3smb/client: do not account EOF extension as allocationfs/smb/client/inode.c+10 -31 reply
3/3smb/client: refresh allocation size after fallocatefs/smb/client/smb2ops.c+15 -03 replies

Reviews trailers per patch

All 3 patches have a Reviewed-by or Acked-by.

PatchChenXiaoSong
1/3R-b
2/3R-b
3/3R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [PATCH v2 0/3] smb: client: fix i_blocks accounting for swapfile xfstests

From: Huiwen He <[email protected]>

This series fixes CIFS swapfile xfstests failures caused by incorrect local i_blocks accounting while cached inode attributes can be used.

The patches cover three cases:

1. Update i_blocks after contiguous writes, so fully written swapfiles do not look sparse.

2. Do not grow i_blocks on EOF extension, since extending EOF does not prove that the range was allocated.

3. After EOF-extending fallocate, refresh i_blocks from the server-reported AllocationSize.

In my setup, the write-created swapfile tests pass with the cifsacl mount option:

        generic/472 generic/494 generic/497
        generic/569 generic/636 generic/643

generic/496 also passes with this series when the server really allocates the fallocated range, for example with Samba:

[scratch_share]
strict allocate = yes

generic/495 depends on the server-reported allocation unit matching the page size. In my Samba setup this requires:

        [global]
        block size = 4096

---
Changes since v1:
- Patch 1 was updated to cover more CIFS write paths and to use common helpers for local i_blocks accounting.
- Patches 2 and 3 are unchanged.

Link to v1:
https://lore.kernel.org/linux-cifs/[email protected]/
---

Thanks,
Huiwen He

Huiwen He (3):
smb/client: update i_blocks after contiguous writes smb/client: do not account EOF extension as allocation smb/client: refresh allocation size after fallocate

 fs/smb/client/cifsfs.c   |  4 ++--
 fs/smb/client/cifsfs.h   |  1 +
 fs/smb/client/cifsglob.h |  9 ++++---
 fs/smb/client/file.c     | 52 ++++++++++++++++++++++++++++++++++++++++
 fs/smb/client/inode.c    | 13 +++++++---
 fs/smb/client/smb2ops.c  | 15 ++++++++++++
 6 files changed, 86 insertions(+), 8 deletions(-)
Signature · 1 line
2.43.0