aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nilfs2/super.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-10 14:26:52 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-10 14:26:52 -0400
commit5f248c9c251c60af3403902b26e08de43964ea0b (patch)
tree6d3328e72a7e4015a64017eb30be18095c6a3c64 /fs/nilfs2/super.c
parentf6cec0ae58c17522a7bc4e2f39dae19f199ab534 (diff)
parentdca332528bc69e05f67161e1ed59929633d5e63d (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (96 commits) no need for list_for_each_entry_safe()/resetting with superblock list Fix sget() race with failing mount vfs: don't hold s_umount over close_bdev_exclusive() call sysv: do not mark superblock dirty on remount sysv: do not mark superblock dirty on mount btrfs: remove junk sb_dirt change BFS: clean up the superblock usage AFFS: wait for sb synchronization when needed AFFS: clean up dirty flag usage cifs: truncate fallout mbcache: fix shrinker function return value mbcache: Remove unused features add f_flags to struct statfs(64) pass a struct path to vfs_statfs update VFS documentation for method changes. All filesystems that need invalidate_inode_buffers() are doing that explicitly convert remaining ->clear_inode() to ->evict_inode() Make ->drop_inode() just return whether inode needs to be dropped fs/inode.c:clear_inode() is gone fs/inode.c:evict() doesn't care about delete vs. non-delete paths now ... Fix up trivial conflicts in fs/nilfs2/super.c
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 26078b3407c9..1fa86b9df73b 100644
--- a/fs/nilfs2/super.c
+++ b/fs/nilfs2/super.c
@@ -171,23 +171,6 @@ void nilfs_destroy_inode(struct inode *inode)
171 kmem_cache_free(nilfs_inode_cachep, NILFS_I(inode)); 171 kmem_cache_free(nilfs_inode_cachep, NILFS_I(inode));
172} 172}
173 173
174static void nilfs_clear_inode(struct inode *inode)
175{
176 struct nilfs_inode_info *ii = NILFS_I(inode);
177
178 /*
179 * Free resources allocated in nilfs_read_inode(), here.
180 */
181 BUG_ON(!list_empty(&ii->i_dirty));
182 brelse(ii->i_bh);
183 ii->i_bh = NULL;
184
185 if (test_bit(NILFS_I_BMAP, &ii->i_state))
186 nilfs_bmap_clear(ii->i_bmap);
187
188 nilfs_btnode_cache_clear(&ii->i_btnode_cache);
189}
190
191static int nilfs_sync_super(struct nilfs_sb_info *sbi, int flag) 174static int nilfs_sync_super(struct nilfs_sb_info *sbi, int flag)
192{ 175{
193 struct the_nilfs *nilfs = sbi->s_nilfs; 176 struct the_nilfs *nilfs = sbi->s_nilfs;
@@ -548,7 +531,7 @@ static const struct super_operations nilfs_sops = {
548 /* .write_inode = nilfs_write_inode, */ 531 /* .write_inode = nilfs_write_inode, */
549 /* .put_inode = nilfs_put_inode, */ 532 /* .put_inode = nilfs_put_inode, */
550 /* .drop_inode = nilfs_drop_inode, */ 533 /* .drop_inode = nilfs_drop_inode, */
551 .delete_inode = nilfs_delete_inode, 534 .evict_inode = nilfs_evict_inode,
552 .put_super = nilfs_put_super, 535 .put_super = nilfs_put_super,
553 /* .write_super = nilfs_write_super, */ 536 /* .write_super = nilfs_write_super, */
554 .sync_fs = nilfs_sync_fs, 537 .sync_fs = nilfs_sync_fs,
@@ -556,7 +539,6 @@ static const struct super_operations nilfs_sops = {
556 /* .unlockfs */ 539 /* .unlockfs */
557 .statfs = nilfs_statfs, 540 .statfs = nilfs_statfs,
558 .remount_fs = nilfs_remount, 541 .remount_fs = nilfs_remount,
559 .clear_inode = nilfs_clear_inode,
560 /* .umount_begin */ 542 /* .umount_begin */
561 .show_options = nilfs_show_options 543 .show_options = nilfs_show_options
562}; 544};