From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 18 May 2024 21:11:54 +0000 (-0700)
Subject: Merge tag 'ext4_for_linus-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7991c92f4cc50b971fcb4d05087e490dc47a6857;p=linux.git

Merge tag 'ext4_for_linus-6.10-rc1' of git://git./linux/kernel/git/tytso/ext4

Pull ext4 updates from Ted Ts'o:

 - 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

* tag 'ext4_for_linus-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (40 commits)
  ext4: fix error pointer dereference in ext4_mb_load_buddy_gfp()
  jbd2: add prefix 'jbd2' for 'shrink_type'
  jbd2: use shrink_type type instead of bool type for __jbd2_journal_clean_checkpoint_list()
  ext4: fix uninitialized ratelimit_state->lock access in __ext4_fill_super()
  ext4: remove calls to to set/clear the folio error flag
  ext4: propagate errors from ext4_sb_bread() in ext4_xattr_block_cache_find()
  ext4: fix mb_cache_entry's e_refcnt leak in ext4_xattr_block_cache_find()
  jbd2: remove redundant assignement to variable err
  ext4: remove the redundant folio_wait_stable()
  ext4: fix potential unnitialized variable
  ext4: convert ac_buddy_page to ac_buddy_folio
  ext4: convert ac_bitmap_page to ac_bitmap_folio
  ext4: convert ext4_mb_init_cache() to take a folio
  ext4: convert bd_buddy_page to bd_buddy_folio
  ext4: convert bd_bitmap_page to bd_bitmap_folio
  ext4: open coding repeated check in next_linear_group
  ext4: use correct criteria name instead stale integer number in comment
  ext4: call ext4_mb_mark_free_simple to free continuous bits in found chunk
  ext4: add test_mb_mark_used_cost to estimate cost of mb_mark_used
  ext4: keep "prefetch_grp" and "nr" consistent
  ...
---

7991c92f4cc50b971fcb4d05087e490dc47a6857
diff --cc fs/ext4/file.c
index 28c51b0cc4db9,77529c655f958..c89e434db6b7b
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@@ -885,7 -884,8 +884,7 @@@ static int ext4_file_open(struct inode 
  			return ret;
  	}
  
- 	filp->f_mode |= FMODE_NOWAIT;
 -	filp->f_mode |= FMODE_NOWAIT | FMODE_BUF_RASYNC |
 -			FMODE_DIO_PARALLEL_WRITE | FMODE_CAN_ODIRECT;
++	filp->f_mode |= FMODE_NOWAIT | FMODE_CAN_ODIRECT;
  	return dquot_file_open(inode, filp);
  }