From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 9 May 2019 16:37:25 +0000 (-0700)
Subject: Merge tag 'for-linus-5.2-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubca... 
X-Git-Tag: v5.15~6411
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=882388056194d2d4c3f589b194b6bdcc47e677e8;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'for-linus-5.2-ofs1' of git://git./linux/kernel/git/hubcap/linux

Pull orangefs updates from Mike Marshall:
 "This includes one fix and our "Orangefs through the pagecache" patch
  series which greatly improves our small IO performance and helps us
  pass more xfstests than before.

  Fix:
   - orangefs: truncate before updating size

  Pagecache series:
   - all the rest"

* tag 'for-linus-5.2-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux: (23 commits)
  orangefs: truncate before updating size
  orangefs: copy Orangefs-sized blocks into the pagecache if possible.
  orangefs: pass slot index back to readpage.
  orangefs: remember count when reading.
  orangefs: add orangefs_revalidate_mapping
  orangefs: implement writepages
  orangefs: write range tracking
  orangefs: avoid fsync service operation on flush
  orangefs: skip inode writeout if nothing to write
  orangefs: move do_readv_writev to direct_IO
  orangefs: do not return successful read when the client-core disappeared
  orangefs: implement writepage
  orangefs: migrate to generic_file_read_iter
  orangefs: service ops done for writeback are not killable
  orangefs: remove orangefs_readpages
  orangefs: reorganize setattr functions to track attribute changes
  orangefs: let setattr write to cached inode
  orangefs: set up and use backing_dev_info
  orangefs: hold i_lock during inode_getattr
  orangefs: update attributes rather than relying on server
  ...
---

882388056194d2d4c3f589b194b6bdcc47e677e8
diff --cc fs/orangefs/super.c
index 3784f7e,8fa30c1..ee5efdc
--- a/fs/orangefs/super.c
+++ b/fs/orangefs/super.c
@@@ -124,9 -125,20 +125,19 @@@ static struct inode *orangefs_alloc_ino
  	return &orangefs_inode->vfs_inode;
  }
  
 -static void orangefs_i_callback(struct rcu_head *head)
 +static void orangefs_free_inode(struct inode *inode)
  {
- 	kmem_cache_free(orangefs_inode_cache, ORANGEFS_I(inode));
 -	struct inode *inode = container_of(head, struct inode, i_rcu);
+ 	struct orangefs_inode_s *orangefs_inode = ORANGEFS_I(inode);
+ 	struct orangefs_cached_xattr *cx;
+ 	struct hlist_node *tmp;
+ 	int i;
+ 
+ 	hash_for_each_safe(orangefs_inode->xattr_cache, i, tmp, cx, node) {
+ 		hlist_del(&cx->node);
+ 		kfree(cx);
+ 	}
+ 
+ 	kmem_cache_free(orangefs_inode_cache, orangefs_inode);
  }
  
  static void orangefs_destroy_inode(struct inode *inode)
@@@ -136,8 -148,17 +147,15 @@@
  	gossip_debug(GOSSIP_SUPER_DEBUG,
  			"%s: deallocated %p destroying inode %pU\n",
  			__func__, orangefs_inode, get_khandle_from_ino(inode));
 -
 -	call_rcu(&inode->i_rcu, orangefs_i_callback);
  }
  
+ static int orangefs_write_inode(struct inode *inode,
+ 				struct writeback_control *wbc)
+ {
+ 	gossip_debug(GOSSIP_SUPER_DEBUG, "orangefs_write_inode\n");
+ 	return orangefs_inode_setattr(inode);
+ }
+ 
  /*
   * NOTE: information filled in here is typically reflected in the
   * output of the system command 'df'
@@@ -295,8 -316,8 +313,9 @@@ void fsid_key_table_finalize(void
  
  static const struct super_operations orangefs_s_ops = {
  	.alloc_inode = orangefs_alloc_inode,
 +	.free_inode = orangefs_free_inode,
  	.destroy_inode = orangefs_destroy_inode,
+ 	.write_inode = orangefs_write_inode,
  	.drop_inode = generic_delete_inode,
  	.statfs = orangefs_statfs,
  	.remount_fs = orangefs_remount_fs,