From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 14 Jan 2016 05:01:44 +0000 (-0800)
Subject: Merge tag 'for-f2fs-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f9a03ae123c92c1f45cd2ca88d0f6edd787be78c;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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

Pull f2fs updates from Jaegeuk Kim:
 "This series adds two ioctls to control cached data and fragmented
  files.  Most of the rest fixes missing error cases and bugs that we
  have not covered so far.  Summary:

  Enhancements:
   - support an ioctl to execute online file defragmentation
   - support an ioctl to flush cached data
   - speed up shrinking of extent_cache entries
   - handle broken superblock
   - refector dirty inode management infra
   - revisit f2fs_map_blocks to handle more cases
   - reduce global lock coverage
   - add detecting user's idle time

  Major bug fixes:
   - fix data race condition on cached nat entries
   - fix error cases of volatile and atomic writes"

* tag 'for-f2fs-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (87 commits)
  f2fs: should unset atomic flag after successful commit
  f2fs: fix wrong memory condition check
  f2fs: monitor the number of background checkpoint
  f2fs: detect idle time depending on user behavior
  f2fs: introduce time and interval facility
  f2fs: skip releasing nodes in chindless extent tree
  f2fs: use atomic type for node count in extent tree
  f2fs: recognize encrypted data in f2fs_fiemap
  f2fs: clean up f2fs_balance_fs
  f2fs: remove redundant calls
  f2fs: avoid unnecessary f2fs_balance_fs calls
  f2fs: check the page status filled from disk
  f2fs: introduce __get_node_page to reuse common code
  f2fs: check node id earily when readaheading node page
  f2fs: read isize while holding i_mutex in fiemap
  Revert "f2fs: check the node block address of newly allocated nid"
  f2fs: cover more area with nat_tree_lock
  f2fs: introduce max_file_blocks in sbi
  f2fs crypto: check CONFIG_F2FS_FS_XATTR for encrypted symlink
  f2fs: introduce zombie list for fast shrinking extent trees
  ...
---

f9a03ae123c92c1f45cd2ca88d0f6edd787be78c
diff --cc fs/f2fs/namei.c
index e7587fce1b80,53d6227f5581..6f944e5eb76e
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@@ -354,9 -359,10 +362,11 @@@ static int f2fs_symlink(struct inode *d
  		inode->i_op = &f2fs_encrypted_symlink_inode_operations;
  	else
  		inode->i_op = &f2fs_symlink_inode_operations;
 +	inode_nohighmem(inode);
  	inode->i_mapping->a_ops = &f2fs_dblock_aops;
  
+ 	f2fs_balance_fs(sbi, true);
+ 
  	f2fs_lock_op(sbi);
  	err = f2fs_add_link(dentry, inode);
  	if (err)
@@@ -933,8 -938,9 +944,8 @@@ static const char *f2fs_encrypted_get_l
  {
  	struct page *cpage = NULL;
  	char *caddr, *paddr = NULL;
- 	struct f2fs_str cstr;
+ 	struct f2fs_str cstr = FSTR_INIT(NULL, 0);
  	struct f2fs_str pstr = FSTR_INIT(NULL, 0);
 -	struct inode *inode = d_inode(dentry);
  	struct f2fs_encrypted_symlink_data *sd;
  	loff_t size = min_t(loff_t, i_size_read(inode), PAGE_SIZE - 1);
  	u32 max_size = inode->i_sb->s_blocksize;
@@@ -1002,9 -1012,11 +1019,10 @@@ errout
  
  const struct inode_operations f2fs_encrypted_symlink_inode_operations = {
  	.readlink       = generic_readlink,
 -	.follow_link    = f2fs_encrypted_follow_link,
 -	.put_link       = kfree_put_link,
 +	.get_link       = f2fs_encrypted_get_link,
  	.getattr	= f2fs_getattr,
  	.setattr	= f2fs_setattr,
+ #ifdef CONFIG_F2FS_FS_XATTR
  	.setxattr	= generic_setxattr,
  	.getxattr	= generic_getxattr,
  	.listxattr	= f2fs_listxattr,