Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

nilfs2: switch to ->free_inode()

kill an extern that went stale 9 years ago, while we are at it...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Al Viro 977c3d18 ca1a199e

+2 -11
-2
fs/nilfs2/nilfs.h
··· 252 252 void nilfs_inode_add_blocks(struct inode *inode, int n); 253 253 void nilfs_inode_sub_blocks(struct inode *inode, int n); 254 254 extern struct inode *nilfs_new_inode(struct inode *, umode_t); 255 - extern void nilfs_free_inode(struct inode *); 256 255 extern int nilfs_get_block(struct inode *, sector_t, struct buffer_head *, int); 257 256 extern void nilfs_set_inode_flags(struct inode *); 258 257 extern int nilfs_read_inode_common(struct inode *, struct nilfs_inode *); ··· 288 289 289 290 /* super.c */ 290 291 extern struct inode *nilfs_alloc_inode(struct super_block *); 291 - extern void nilfs_destroy_inode(struct inode *); 292 292 293 293 extern __printf(3, 4) 294 294 void __nilfs_msg(struct super_block *sb, const char *level,
+2 -9
fs/nilfs2/super.c
··· 155 155 return &ii->vfs_inode; 156 156 } 157 157 158 - static void nilfs_i_callback(struct rcu_head *head) 158 + static void nilfs_free_inode(struct inode *inode) 159 159 { 160 - struct inode *inode = container_of(head, struct inode, i_rcu); 161 - 162 160 if (nilfs_is_metadata_file_inode(inode)) 163 161 nilfs_mdt_destroy(inode); 164 162 165 163 kmem_cache_free(nilfs_inode_cachep, NILFS_I(inode)); 166 - } 167 - 168 - void nilfs_destroy_inode(struct inode *inode) 169 - { 170 - call_rcu(&inode->i_rcu, nilfs_i_callback); 171 164 } 172 165 173 166 static int nilfs_sync_super(struct super_block *sb, int flag) ··· 679 686 680 687 static const struct super_operations nilfs_sops = { 681 688 .alloc_inode = nilfs_alloc_inode, 682 - .destroy_inode = nilfs_destroy_inode, 689 + .free_inode = nilfs_free_inode, 683 690 .dirty_inode = nilfs_dirty_inode, 684 691 .evict_inode = nilfs_evict_inode, 685 692 .put_super = nilfs_put_super,