From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Mar 2022 17:00:31 +0000 (-0700)
Subject: Merge tag 'f2fs-for-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk... 
X-Git-Tag: v6.1-rc5~1786
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ef510682af3dbe2f9cdae7126a1461c94e010967;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'f2fs-for-5.18' of git://git./linux/kernel/git/jaegeuk/f2fs

Pull f2fs updates from Jaegeuk Kim:
 "In this cycle, f2fs has some performance improvements for Android
  workloads such as using read-unfair rwsems and adding some sysfs
  entries to control GCs and discard commands in more details. In
  addtiion, it has some tunings to improve the recovery speed after
  sudden power-cut.

  Enhancement:
   - add reader-unfair rwsems with F2FS_UNFAIR_RWSEM: will replace with
     generic API support
   - adjust to make the readahead/recovery flow more efficiently
   - sysfs entries to control issue speeds of GCs and Discard commands
   - enable idmapped mounts

  Bug fix:
   - correct wrong error handling routines
   - fix missing conditions in quota
   - fix a potential deadlock between writeback and block plug routines
   - fix a deadlock btween freezefs and evict_inode

  We've added some boundary checks to avoid kernel panics on corrupted
  images, and several minor code clean-ups"

* tag 'f2fs-for-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (27 commits)
  f2fs: fix to do sanity check on .cp_pack_total_block_count
  f2fs: make gc_urgent and gc_segment_mode sysfs node readable
  f2fs: use aggressive GC policy during f2fs_disable_checkpoint()
  f2fs: fix compressed file start atomic write may cause data corruption
  f2fs: initialize sbi->gc_mode explicitly
  f2fs: introduce gc_urgent_mid mode
  f2fs: compress: fix to print raw data size in error path of lz4 decompression
  f2fs: remove redundant parameter judgment
  f2fs: use spin_lock to avoid hang
  f2fs: don't get FREEZE lock in f2fs_evict_inode in frozen fs
  f2fs: remove unnecessary read for F2FS_FITS_IN_INODE
  f2fs: introduce F2FS_UNFAIR_RWSEM to support unfair rwsem
  f2fs: avoid an infinite loop in f2fs_sync_dirty_inodes
  f2fs: fix to do sanity check on curseg->alloc_type
  f2fs: fix to avoid potential deadlock
  f2fs: quota: fix loop condition at f2fs_quota_sync()
  f2fs: Restore rwsem lockdep support
  f2fs: fix missing free nid in f2fs_handle_failed_inode
  f2fs: support idmapped mounts
  f2fs: add a way to limit roll forward recovery time
  ...
---

ef510682af3dbe2f9cdae7126a1461c94e010967
diff --cc fs/f2fs/data.c
index 79c9ed7,5675af1..67d031589
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@@ -589,12 -595,13 +589,12 @@@ static void __f2fs_submit_merged_write(
  	/* change META to META_FLUSH in the checkpoint procedure */
  	if (type >= META_FLUSH) {
  		io->fio.type = META_FLUSH;
 -		io->fio.op = REQ_OP_WRITE;
 -		io->fio.op_flags = REQ_META | REQ_PRIO | REQ_SYNC;
 +		io->bio->bi_opf |= REQ_META | REQ_PRIO | REQ_SYNC;
  		if (!test_opt(sbi, NOBARRIER))
 -			io->fio.op_flags |= REQ_PREFLUSH | REQ_FUA;
 +			io->bio->bi_opf |= REQ_PREFLUSH | REQ_FUA;
  	}
  	__submit_merged_bio(io);
- 	up_write(&io->io_rwsem);
+ 	f2fs_up_write(&io->io_rwsem);
  }
  
  static void __submit_merged_write_cond(struct f2fs_sb_info *sbi,