Skip to content

Commit c148bc7

Browse files
committed
Merge tag 'xfs-6.15-merge' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull xfs updates from Carlos Maiolino: - XFS zoned allocator: Enables XFS to support zoned devices using its real-time allocator - Use folios/vmalloc for buffer cache backing memory - Some code cleanups and bug fixes * tag 'xfs-6.15-merge' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: (70 commits) xfs: remove the flags argument to xfs_buf_get_uncached xfs: remove the flags argument to xfs_buf_read_uncached xfs: remove xfs_buf_free_maps xfs: remove xfs_buf_get_maps xfs: call xfs_buf_alloc_backing_mem from _xfs_buf_alloc xfs: remove unnecessary NULL check before kvfree() xfs: don't wake zone space waiters without m_zone_info xfs: don't increment m_generation for all errors in xfs_growfs_data xfs: fix a missing unlock in xfs_growfs_data xfs: Remove duplicate xfs_rtbitmap.h header xfs: trigger zone GC when out of available rt blocks xfs: trace what memory backs a buffer xfs: cleanup mapping tmpfs folios into the buffer cache xfs: use vmalloc instead of vm_map_area for buffer backing memory xfs: buffer items don't straddle pages anymore xfs: kill XBF_UNMAPPED xfs: convert buffer cache to use high order folios xfs: remove the kmalloc to page allocator fallback xfs: refactor backing memory allocations for buffers xfs: remove xfs_buf_is_vmapped ...
2 parents 0de1e84 + b3f8f29 commit c148bc7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+5920
-1488
lines changed

fs/xfs/Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ xfs-y += $(addprefix libxfs/, \
6464
xfs-$(CONFIG_XFS_RT) += $(addprefix libxfs/, \
6565
xfs_rtbitmap.o \
6666
xfs_rtgroup.o \
67+
xfs_zones.o \
6768
)
6869

6970
# highlevel code
@@ -136,7 +137,11 @@ xfs-$(CONFIG_XFS_QUOTA) += xfs_dquot.o \
136137
xfs_quotaops.o
137138

138139
# xfs_rtbitmap is shared with libxfs
139-
xfs-$(CONFIG_XFS_RT) += xfs_rtalloc.o
140+
xfs-$(CONFIG_XFS_RT) += xfs_rtalloc.o \
141+
xfs_zone_alloc.o \
142+
xfs_zone_gc.o \
143+
xfs_zone_info.o \
144+
xfs_zone_space_resv.o
140145

141146
xfs-$(CONFIG_XFS_POSIX_ACL) += xfs_acl.o
142147
xfs-$(CONFIG_SYSCTL) += xfs_sysctl.o

fs/xfs/libxfs/xfs_ag.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ xfs_get_aghdr_buf(
301301
struct xfs_buf *bp;
302302
int error;
303303

304-
error = xfs_buf_get_uncached(mp->m_ddev_targp, numblks, 0, &bp);
304+
error = xfs_buf_get_uncached(mp->m_ddev_targp, numblks, &bp);
305305
if (error)
306306
return error;
307307

0 commit comments

Comments
 (0)