From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 11 Jun 2018 17:16:13 +0000 (-0700)
Subject: Merge tag 'f2fs-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d54d35c501bcbd57b9722a6b371c0608b5d34199;p=openwrt%2Fstaging%2Fblogic.git

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

Pull f2fs updates from Jaegeuk Kim:
 "In this round, we've mainly focused on discard, aka unmap, control
  along with fstrim for Android-specific usage model. In addition, we've
  fixed writepage flow which returned EAGAIN previously resulting in EIO
  of fsync(2) due to mapping's error state. In order to avoid old MM bug
  [1], we decided not to use __GFP_ZERO for the mapping for node and
  meta page caches. As always, we've cleaned up many places for future
  fsverity and symbol conflicts.

  Enhancements:
   - do discard/fstrim in lower priority considering fs utilization
   - split large discard commands into smaller ones for better responsiveness
   - add more sanity checks to address syzbot reports
   - add a mount option, fsync_mode=nobarrier, which can reduce # of cache flushes
   - clean up symbol namespace with modified function names
   - be strict on block allocation and IO control in corner cases

  Bug fixes:
   - don't use __GFP_ZERO for mappings
   - fix error reports in writepage to avoid fsync() failure
   - avoid selinux denial on CAP_RESOURCE on resgid/resuid
   - fix some subtle race conditions in GC/atomic writes/shutdown
   - fix overflow bugs in sanity_check_raw_super
   - fix missing bits on get_flags

  Clean-ups:
   - prepare the generic flow for future fsverity integration
   - fix some broken coding standard"

[1] https://lkml.org/lkml/2018/4/8/661

* tag 'f2fs-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (79 commits)
  f2fs: fix to clear FI_VOLATILE_FILE correctly
  f2fs: let sync node IO interrupt async one
  f2fs: don't change wbc->sync_mode
  f2fs: fix to update mtime correctly
  fs: f2fs: insert space around that ':' and ', '
  fs: f2fs: add missing blank lines after declarations
  fs: f2fs: changed variable type of offset "unsigned" to "loff_t"
  f2fs: clean up symbol namespace
  f2fs: make set_de_type() static
  f2fs: make __f2fs_write_data_pages() static
  f2fs: fix to avoid accessing cross the boundary
  f2fs: fix to let caller retry allocating block address
  disable loading f2fs module on PAGE_SIZE > 4KB
  f2fs: fix error path of move_data_page
  f2fs: don't drop dentry pages after fs shutdown
  f2fs: fix to avoid race during access gc_thread pointer
  f2fs: clean up with clear_radix_tree_dirty_tag
  f2fs: fix to don't trigger writeback during recovery
  f2fs: clear discard_wake earlier
  f2fs: let discard thread wait a little longer if dev is busy
  ...
---

d54d35c501bcbd57b9722a6b371c0608b5d34199
diff --cc fs/f2fs/namei.c
index 75e37fd720b2,5d2d822092a2..64050c84d353
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@@ -292,9 -295,10 +295,9 @@@ static int f2fs_create(struct inode *di
  		goto out;
  	f2fs_unlock_op(sbi);
  
- 	alloc_nid_done(sbi, ino);
+ 	f2fs_alloc_nid_done(sbi, ino);
  
 -	unlock_new_inode(inode);
 -	d_instantiate(dentry, inode);
 +	d_instantiate_new(dentry, inode);
  
  	if (IS_DIRSYNC(dir))
  		f2fs_sync_fs(sbi->sb, 1);
@@@ -657,9 -662,10 +660,9 @@@ static int f2fs_mkdir(struct inode *dir
  		goto out_fail;
  	f2fs_unlock_op(sbi);
  
- 	alloc_nid_done(sbi, inode->i_ino);
+ 	f2fs_alloc_nid_done(sbi, inode->i_ino);
  
 -	unlock_new_inode(inode);
 -	d_instantiate(dentry, inode);
 +	d_instantiate_new(dentry, inode);
  
  	if (IS_DIRSYNC(dir))
  		f2fs_sync_fs(sbi->sb, 1);
@@@ -708,9 -714,10 +711,9 @@@ static int f2fs_mknod(struct inode *dir
  		goto out;
  	f2fs_unlock_op(sbi);
  
- 	alloc_nid_done(sbi, inode->i_ino);
+ 	f2fs_alloc_nid_done(sbi, inode->i_ino);
  
 -	unlock_new_inode(inode);
 -	d_instantiate(dentry, inode);
 +	d_instantiate_new(dentry, inode);
  
  	if (IS_DIRSYNC(dir))
  		f2fs_sync_fs(sbi->sb, 1);