summaryrefslogtreecommitdiffstats
path: root/fs/orangefs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-03-02 18:20:00 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2017-03-02 18:20:00 -0500
commit94e877d0fb43bec0540d6a37d49cb4f7f05a5348 (patch)
treedc301912dff9c390cba59df00cb76b62ac862d6a /fs/orangefs
parent69fd110eb650ea7baa82158f3b89a7d86da1d056 (diff)
parent653a7746fa2f5369985f5368ffc162b6510db6c8 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs pile two from Al Viro: - orangefs fix - series of fs/namei.c cleanups from me - VFS stuff coming from overlayfs tree * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: orangefs: Use RCU for destroy_inode vfs: use helper for calling f_op->fsync() mm: use helper for calling f_op->mmap() vfs: use helpers for calling f_op->{read,write}_iter() vfs: pass type instead of fn to do_{loop,iter}_readv_writev() vfs: extract common parts of {compat_,}do_readv_writev() vfs: wrap write f_ops with file_{start,end}_write() vfs: deny copy_file_range() for non regular files vfs: deny fallocate() on directory vfs: create vfs helper vfs_tmpfile() namei.c: split unlazy_walk() namei.c: fold the check for DCACHE_OP_REVALIDATE into d_revalidate() lookup_fast(): clean up the logics around the fallback to non-rcu mode namei: fold unlazy_link() into its sole caller
Diffstat (limited to 'fs/orangefs')
-rw-r--r--fs/orangefs/super.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c
index c48859f16e7b..67c24351a67f 100644
--- a/fs/orangefs/super.c
+++ b/fs/orangefs/super.c
@@ -115,6 +115,13 @@ static struct inode *orangefs_alloc_inode(struct super_block *sb)
115 return &orangefs_inode->vfs_inode; 115 return &orangefs_inode->vfs_inode;
116} 116}
117 117
118static void orangefs_i_callback(struct rcu_head *head)
119{
120 struct inode *inode = container_of(head, struct inode, i_rcu);
121 struct orangefs_inode_s *orangefs_inode = ORANGEFS_I(inode);
122 kmem_cache_free(orangefs_inode_cache, orangefs_inode);
123}
124
118static void orangefs_destroy_inode(struct inode *inode) 125static void orangefs_destroy_inode(struct inode *inode)
119{ 126{
120 struct orangefs_inode_s *orangefs_inode = ORANGEFS_I(inode); 127 struct orangefs_inode_s *orangefs_inode = ORANGEFS_I(inode);
@@ -123,7 +130,7 @@ static void orangefs_destroy_inode(struct inode *inode)
123 "%s: deallocated %p destroying inode %pU\n", 130 "%s: deallocated %p destroying inode %pU\n",
124 __func__, orangefs_inode, get_khandle_from_ino(inode)); 131 __func__, orangefs_inode, get_khandle_from_ino(inode));
125 132
126 kmem_cache_free(orangefs_inode_cache, orangefs_inode); 133 call_rcu(&inode->i_rcu, orangefs_i_callback);
127} 134}
128 135
129/* 136/*