| Message ID | 20240518044601.GA478319@mit.edu |
|---|---|
| State | New |
| Headers | show |
| Series | [GIT,PULL] ext4 updates for v6.10-rc1 | expand |
On Fri, 17 May 2024 at 21:46, Theodore Ts'o <tytso@mit.edu> wrote: > > Note that there is a relatively merge conflict; the relatively simple > resolution which I used when running regression tests is at the tag > ext4_merge_resolution in the ext4 git repo, Heh. That tag just points to the same commit you asked me to pull. I think you may have tagged it before you actually committed your merge resolution. That said, the merge resolution looks trivial, so no big deal. When people send me a suggested merge, I usually compare against it just because it's cheap insurance, not because it's usually necessary. But you may want to check that I actually did the same thing you did. Linus
The pull request you sent on Sat, 18 May 2024 00:46:01 -0400:
> https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git tags/ext4_for_linus-6.10-rc1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/7991c92f4cc50b971fcb4d05087e490dc47a6857
Thank you!
The following changes since commit 0bbac3facb5d6cc0171c45c9873a2dc96bea9680: Linux 6.9-rc4 (2024-04-14 13:38:39 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git tags/ext4_for_linus-6.10-rc1 for you to fetch changes up to c6a6c9694aadc4c3ab8d89bdd44aed3eab1e43c6: ext4: fix error pointer dereference in ext4_mb_load_buddy_gfp() (2024-05-17 11:24:38 -0400) Note that there is a relatively merge conflict; the relatively simple resolution which I used when running regression tests is at the tag ext4_merge_resolution in the ext4 git repo, https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ---------------------------------------------------------------- Ext4 patches for the 6.10-rc1 merge window: - more folio conversion patches - add support for FS_IOC_GETFSSYSFSPATH - mballoc cleaups and add more kunit tests - sysfs cleanups and bug fixes - miscellaneous bug fixes and cleanups ---------------------------------------------------------------- Baokun Li (12): ext4: avoid overflow when setting values via sysfs ext4: refactor out ext4_generic_attr_store() ext4: refactor out ext4_generic_attr_show() ext4: fix slab-out-of-bounds in ext4_mb_find_good_group_avg_frag_lists() ext4: add new attr pointer attr_mb_order ext4: add positive int attr pointer to avoid sysfs variables overflow ext4: set type of ac_groups_linear_remaining to __u32 to avoid overflow ext4: set the type of max_zeroout to unsigned int to avoid overflow ext4: clean up s_mb_rb_lock to fix build warnings with C=1 ext4: fix mb_cache_entry's e_refcnt leak in ext4_xattr_block_cache_find() ext4: propagate errors from ext4_sb_bread() in ext4_xattr_block_cache_find() ext4: fix uninitialized ratelimit_state->lock access in __ext4_fill_super() Christoph Hellwig (1): ext4: set FMODE_CAN_ODIRECT instead of a dummy direct_IO method Colin Ian King (1): jbd2: remove redundant assignement to variable err Dan Carpenter (2): ext4: fix potential unnitialized variable ext4: fix error pointer dereference in ext4_mb_load_buddy_gfp() Jan Kara (3): ext4: avoid excessive credit estimate in ext4_tmpfile() Revert "ext4: drop duplicate ea_inode handling in ext4_xattr_block_set()" ext4: do not create EA inode under buffer lock Justin Stitt (1): ext4: replace deprecated strncpy with alternatives Kemeng Shi (6): ext4: implement filesystem specific alloc_inode in unit test ext4: keep "prefetch_grp" and "nr" consistent ext4: add test_mb_mark_used_cost to estimate cost of mb_mark_used ext4: call ext4_mb_mark_free_simple to free continuous bits in found chunk ext4: use correct criteria name instead stale integer number in comment ext4: open coding repeated check in next_linear_group Kent Overstreet (1): ext4: add support for FS_IOC_GETFSSYSFSPATH Matthew Wilcox (Oracle) (6): ext4: convert bd_bitmap_page to bd_bitmap_folio ext4: convert bd_buddy_page to bd_buddy_folio ext4: convert ext4_mb_init_cache() to take a folio ext4: convert ac_bitmap_page to ac_bitmap_folio ext4: convert ac_buddy_page to ac_buddy_folio ext4: remove calls to to set/clear the folio error flag Max Kellermann (1): Revert "ext4: apply umask if ACL support is disabled" Ritesh Harjani (IBM) (2): ext4: Fixes len calculation in mpage_journal_page_buffers ext4: Remove PAGE_MASK dependency on mpage_submit_folio Thorsten Blum (1): ext4: remove unneeded if checks before kfree Ye Bin (2): jbd2: use shrink_type type instead of bool type for __jbd2_journal_clean_checkpoint_list() jbd2: add prefix 'jbd2' for 'shrink_type' Zhang Yi (1): ext4: remove the redundant folio_wait_stable() fs/ext4/acl.h | 5 - fs/ext4/ext4.h | 9 +- fs/ext4/extents.c | 3 +- fs/ext4/file.c | 5 +- fs/ext4/inode.c | 11 +- fs/ext4/ioctl.c | 3 +- fs/ext4/mballoc-test.c | 76 +++++++++++++ fs/ext4/mballoc.c | 322 +++++++++++++++++++++++++++++--------------------------- fs/ext4/mballoc.h | 14 +-- fs/ext4/move_extent.c | 4 +- fs/ext4/namei.c | 2 +- fs/ext4/page-io.c | 3 - fs/ext4/readpage.c | 1 - fs/ext4/super.c | 36 +++---- fs/ext4/sysfs.c | 174 ++++++++++++++++++------------ fs/ext4/xattr.c | 145 +++++++++++++------------ fs/jbd2/checkpoint.c | 24 +++-- fs/jbd2/commit.c | 3 +- include/linux/jbd2.h | 4 +- 19 files changed, 481 insertions(+), 363 deletions(-)