aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nilfs2/super.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2010-06-07 11:55:00 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2010-08-09 16:48:25 -0400
commit6fd1e5c994c392ebdbe45600051b2a32ec4860f1 (patch)
tree672de56405c3a7dd4ffb079304661e4ef14401b7 /fs/nilfs2/super.c
parent4ec70c9b46b032e7f1b41b543c607d6a33b78a1a (diff)
convert nilfs2 to ->evict_inode()
[folded build fix from sfr] Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/nilfs2/super.c')
-rw-r--r--fs/nilfs2/super.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c
index 414ef68931cf..7c7572a4e138 100644
--- a/fs/nilfs2/super.c
+++ b/fs/nilfs2/super.c
@@ -159,23 +159,6 @@ void nilfs_destroy_inode(struct inode *inode)
159 kmem_cache_free(nilfs_inode_cachep, NILFS_I(inode)); 159 kmem_cache_free(nilfs_inode_cachep, NILFS_I(inode));
160} 160}
161 161
162static void nilfs_clear_inode(struct inode *inode)
163{
164 struct nilfs_inode_info *ii = NILFS_I(inode);
165
166 /*
167 * Free resources allocated in nilfs_read_inode(), here.
168 */
169 BUG_ON(!list_empty(&ii->i_dirty));
170 brelse(ii->i_bh);
171 ii->i_bh = NULL;
172
173 if (test_bit(NILFS_I_BMAP, &ii->i_state))
174 nilfs_bmap_clear(ii->i_bmap);
175
176 nilfs_btnode_cache_clear(&ii->i_btnode_cache);
177}
178
179static int nilfs_sync_super(struct nilfs_sb_info *sbi, int dupsb) 162static int nilfs_sync_super(struct nilfs_sb_info *sbi, int dupsb)
180{ 163{
181 struct the_nilfs *nilfs = sbi->s_nilfs; 164 struct the_nilfs *nilfs = sbi->s_nilfs;
@@ -467,7 +450,7 @@ static const struct super_operations nilfs_sops = {
467 /* .write_inode = nilfs_write_inode, */ 450 /* .write_inode = nilfs_write_inode, */
468 /* .put_inode = nilfs_put_inode, */ 451 /* .put_inode = nilfs_put_inode, */
469 /* .drop_inode = nilfs_drop_inode, */ 452 /* .drop_inode = nilfs_drop_inode, */
470 .delete_inode = nilfs_delete_inode, 453 .evict_inode = nilfs_evict_inode,
471 .put_super = nilfs_put_super, 454 .put_super = nilfs_put_super,
472 /* .write_super = nilfs_write_super, */ 455 /* .write_super = nilfs_write_super, */
473 .sync_fs = nilfs_sync_fs, 456 .sync_fs = nilfs_sync_fs,
@@ -475,7 +458,6 @@ static const struct super_operations nilfs_sops = {
475 /* .unlockfs */ 458 /* .unlockfs */
476 .statfs = nilfs_statfs, 459 .statfs = nilfs_statfs,
477 .remount_fs = nilfs_remount, 460 .remount_fs = nilfs_remount,
478 .clear_inode = nilfs_clear_inode,
479 /* .umount_begin */ 461 /* .umount_begin */
480 .show_options = nilfs_show_options 462 .show_options = nilfs_show_options
481}; 463};