aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2009-04-27 09:46:41 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2009-06-11 21:36:05 -0400
commit59d697b70285c348c01cfc2695c3469ba71d7539 (patch)
treee383e5a2c0fc6196bed269aac032d3e363e9c4f7
parentc3f8a40c1cd5591b882497d1d00d43d0e5bb4698 (diff)
btrfs: remove ->write_super and stop maintaining ->s_dirt
Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/btrfs/inode.c7
-rw-r--r--fs/btrfs/super.c8
2 files changed, 0 insertions, 15 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 5b68330f8585..8612b3a09811 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2322,7 +2322,6 @@ err:
2322 btrfs_update_inode(trans, root, dir); 2322 btrfs_update_inode(trans, root, dir);
2323 btrfs_drop_nlink(inode); 2323 btrfs_drop_nlink(inode);
2324 ret = btrfs_update_inode(trans, root, inode); 2324 ret = btrfs_update_inode(trans, root, inode);
2325 dir->i_sb->s_dirt = 1;
2326out: 2325out:
2327 return ret; 2326 return ret;
2328} 2327}
@@ -2806,7 +2805,6 @@ error:
2806 pending_del_nr); 2805 pending_del_nr);
2807 } 2806 }
2808 btrfs_free_path(path); 2807 btrfs_free_path(path);
2809 inode->i_sb->s_dirt = 1;
2810 return ret; 2808 return ret;
2811} 2809}
2812 2810
@@ -3768,7 +3766,6 @@ static int btrfs_mknod(struct inode *dir, struct dentry *dentry,
3768 init_special_inode(inode, inode->i_mode, rdev); 3766 init_special_inode(inode, inode->i_mode, rdev);
3769 btrfs_update_inode(trans, root, inode); 3767 btrfs_update_inode(trans, root, inode);
3770 } 3768 }
3771 dir->i_sb->s_dirt = 1;
3772 btrfs_update_inode_block_group(trans, inode); 3769 btrfs_update_inode_block_group(trans, inode);
3773 btrfs_update_inode_block_group(trans, dir); 3770 btrfs_update_inode_block_group(trans, dir);
3774out_unlock: 3771out_unlock:
@@ -3833,7 +3830,6 @@ static int btrfs_create(struct inode *dir, struct dentry *dentry,
3833 inode->i_op = &btrfs_file_inode_operations; 3830 inode->i_op = &btrfs_file_inode_operations;
3834 BTRFS_I(inode)->io_tree.ops = &btrfs_extent_io_ops; 3831 BTRFS_I(inode)->io_tree.ops = &btrfs_extent_io_ops;
3835 } 3832 }
3836 dir->i_sb->s_dirt = 1;
3837 btrfs_update_inode_block_group(trans, inode); 3833 btrfs_update_inode_block_group(trans, inode);
3838 btrfs_update_inode_block_group(trans, dir); 3834 btrfs_update_inode_block_group(trans, dir);
3839out_unlock: 3835out_unlock:
@@ -3880,7 +3876,6 @@ static int btrfs_link(struct dentry *old_dentry, struct inode *dir,
3880 if (err) 3876 if (err)
3881 drop_inode = 1; 3877 drop_inode = 1;
3882 3878
3883 dir->i_sb->s_dirt = 1;
3884 btrfs_update_inode_block_group(trans, dir); 3879 btrfs_update_inode_block_group(trans, dir);
3885 err = btrfs_update_inode(trans, root, inode); 3880 err = btrfs_update_inode(trans, root, inode);
3886 3881
@@ -3962,7 +3957,6 @@ static int btrfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
3962 3957
3963 d_instantiate(dentry, inode); 3958 d_instantiate(dentry, inode);
3964 drop_on_err = 0; 3959 drop_on_err = 0;
3965 dir->i_sb->s_dirt = 1;
3966 btrfs_update_inode_block_group(trans, inode); 3960 btrfs_update_inode_block_group(trans, inode);
3967 btrfs_update_inode_block_group(trans, dir); 3961 btrfs_update_inode_block_group(trans, dir);
3968 3962
@@ -4991,7 +4985,6 @@ static int btrfs_symlink(struct inode *dir, struct dentry *dentry,
4991 inode->i_op = &btrfs_file_inode_operations; 4985 inode->i_op = &btrfs_file_inode_operations;
4992 BTRFS_I(inode)->io_tree.ops = &btrfs_extent_io_ops; 4986 BTRFS_I(inode)->io_tree.ops = &btrfs_extent_io_ops;
4993 } 4987 }
4994 dir->i_sb->s_dirt = 1;
4995 btrfs_update_inode_block_group(trans, inode); 4988 btrfs_update_inode_block_group(trans, inode);
4996 btrfs_update_inode_block_group(trans, dir); 4989 btrfs_update_inode_block_group(trans, dir);
4997 if (drop_inode) 4990 if (drop_inode)
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 708ac06b953b..52d84522c2c2 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -397,7 +397,6 @@ int btrfs_sync_fs(struct super_block *sb, int wait)
397 if (sb->s_flags & MS_RDONLY) 397 if (sb->s_flags & MS_RDONLY)
398 return 0; 398 return 0;
399 399
400 sb->s_dirt = 0;
401 if (!wait) { 400 if (!wait) {
402 filemap_flush(root->fs_info->btree_inode->i_mapping); 401 filemap_flush(root->fs_info->btree_inode->i_mapping);
403 return 0; 402 return 0;
@@ -408,7 +407,6 @@ int btrfs_sync_fs(struct super_block *sb, int wait)
408 407
409 trans = btrfs_start_transaction(root, 1); 408 trans = btrfs_start_transaction(root, 1);
410 ret = btrfs_commit_transaction(trans, root); 409 ret = btrfs_commit_transaction(trans, root);
411 sb->s_dirt = 0;
412 return ret; 410 return ret;
413} 411}
414 412
@@ -454,11 +452,6 @@ static int btrfs_show_options(struct seq_file *seq, struct vfsmount *vfs)
454 return 0; 452 return 0;
455} 453}
456 454
457static void btrfs_write_super(struct super_block *sb)
458{
459 sb->s_dirt = 0;
460}
461
462static int btrfs_test_super(struct super_block *s, void *data) 455static int btrfs_test_super(struct super_block *s, void *data)
463{ 456{
464 struct btrfs_fs_devices *test_fs_devices = data; 457 struct btrfs_fs_devices *test_fs_devices = data;
@@ -689,7 +682,6 @@ static int btrfs_unfreeze(struct super_block *sb)
689static struct super_operations btrfs_super_ops = { 682static struct super_operations btrfs_super_ops = {
690 .delete_inode = btrfs_delete_inode, 683 .delete_inode = btrfs_delete_inode,
691 .put_super = btrfs_put_super, 684 .put_super = btrfs_put_super,
692 .write_super = btrfs_write_super,
693 .sync_fs = btrfs_sync_fs, 685 .sync_fs = btrfs_sync_fs,
694 .show_options = btrfs_show_options, 686 .show_options = btrfs_show_options,
695 .write_inode = btrfs_write_inode, 687 .write_inode = btrfs_write_inode,