Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59d697b7 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Al Viro
Browse files

btrfs: remove ->write_super and stop maintaining ->s_dirt 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent c3f8a40c

fs/btrfs/inode.c

+0 −7
Original line number Diff line number Diff line
@@ -2322,7 +2322,6 @@ int btrfs_unlink_inode(struct btrfs_trans_handle *trans, 
	btrfs_update_inode(trans, root, dir);

	btrfs_drop_nlink(inode);

	ret = btrfs_update_inode(trans, root, inode);

	dir->i_sb->s_dirt = 1;

out:

	return ret;

}
@@ -2806,7 +2805,6 @@ noinline int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, 
				      pending_del_nr);

	}

	btrfs_free_path(path);

	inode->i_sb->s_dirt = 1;

	return ret;

}
@@ -3768,7 +3766,6 @@ static int btrfs_mknod(struct inode *dir, struct dentry *dentry, 
		init_special_inode(inode, inode->i_mode, rdev);

		btrfs_update_inode(trans, root, inode);

	}

	dir->i_sb->s_dirt = 1;

	btrfs_update_inode_block_group(trans, inode);

	btrfs_update_inode_block_group(trans, dir);

out_unlock:
@@ -3833,7 +3830,6 @@ static int btrfs_create(struct inode *dir, struct dentry *dentry, 
		inode->i_op = &btrfs_file_inode_operations;

		BTRFS_I(inode)->io_tree.ops = &btrfs_extent_io_ops;

	}

	dir->i_sb->s_dirt = 1;

	btrfs_update_inode_block_group(trans, inode);

	btrfs_update_inode_block_group(trans, dir);

out_unlock:
@@ -3880,7 +3876,6 @@ static int btrfs_link(struct dentry *old_dentry, struct inode *dir, 
	if (err)

		drop_inode = 1;



	dir->i_sb->s_dirt = 1;

	btrfs_update_inode_block_group(trans, dir);

	err = btrfs_update_inode(trans, root, inode);
@@ -3962,7 +3957,6 @@ static int btrfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) 


	d_instantiate(dentry, inode);

	drop_on_err = 0;

	dir->i_sb->s_dirt = 1;

	btrfs_update_inode_block_group(trans, inode);

	btrfs_update_inode_block_group(trans, dir);
@@ -4991,7 +4985,6 @@ static int btrfs_symlink(struct inode *dir, struct dentry *dentry, 
		inode->i_op = &btrfs_file_inode_operations;

		BTRFS_I(inode)->io_tree.ops = &btrfs_extent_io_ops;

	}

	dir->i_sb->s_dirt = 1;

	btrfs_update_inode_block_group(trans, inode);

	btrfs_update_inode_block_group(trans, dir);

	if (drop_inode)

fs/btrfs/super.c

+0 −8
Original line number Diff line number Diff line
@@ -397,7 +397,6 @@ int btrfs_sync_fs(struct super_block *sb, int wait) 
	if (sb->s_flags & MS_RDONLY)

		return 0;



	sb->s_dirt = 0;

	if (!wait) {

		filemap_flush(root->fs_info->btree_inode->i_mapping);

		return 0;
@@ -408,7 +407,6 @@ int btrfs_sync_fs(struct super_block *sb, int wait) 


	trans = btrfs_start_transaction(root, 1);

	ret = btrfs_commit_transaction(trans, root);

	sb->s_dirt = 0;

	return ret;

}
@@ -454,11 +452,6 @@ static int btrfs_show_options(struct seq_file *seq, struct vfsmount *vfs) 
	return 0;

}



static void btrfs_write_super(struct super_block *sb)

{

	sb->s_dirt = 0;

}



static int btrfs_test_super(struct super_block *s, void *data)

{

	struct btrfs_fs_devices *test_fs_devices = data;
@@ -689,7 +682,6 @@ static int btrfs_unfreeze(struct super_block *sb) 
static struct super_operations btrfs_super_ops = {

	.delete_inode	= btrfs_delete_inode,

	.put_super	= btrfs_put_super,

	.write_super	= btrfs_write_super,

	.sync_fs	= btrfs_sync_fs,

	.show_options	= btrfs_show_options,

	.write_inode	= btrfs_write_inode,