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

Commit 6885f308 authored by Chris Mason's avatar Chris Mason
Browse files

Btrfs: Misc 2.6.25 updates 



Remove the btrfs read_inode method, and use save_mount_options

Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent e3fe4e71

fs/btrfs/inode.c

+1 −28
Original line number Original line Diff line number Diff line
@@ -297,7 +297,6 @@ int btrfs_clear_bit_hook(struct inode *inode, u64 start, u64 end, 




int btrfs_submit_bio_hook(int rw, struct bio *bio)

int btrfs_submit_bio_hook(int rw, struct bio *bio)

{

{

	// struct bio_vec *bvec = bio->bi_io_vec + bio->bi_vcnt - 1;

	struct bio_vec *bvec = bio->bi_io_vec;

	struct bio_vec *bvec = bio->bi_io_vec;

	struct inode *inode = bvec->bv_page->mapping->host;

	struct inode *inode = bvec->bv_page->mapping->host;

	struct btrfs_root *root = BTRFS_I(inode)->root;

	struct btrfs_root *root = BTRFS_I(inode)->root;
@@ -320,32 +319,7 @@ int btrfs_submit_bio_hook(int rw, struct bio *bio) 
	mutex_unlock(&root->fs_info->fs_mutex);

	mutex_unlock(&root->fs_info->fs_mutex);

	return ret;

	return ret;

}

}

#if 0



int btrfs_writepage_io_hook(struct page *page, u64 start, u64 end)

{

	struct inode *inode = page->mapping->host;

	struct btrfs_root *root = BTRFS_I(inode)->root;

	struct btrfs_trans_handle *trans;

	char *kaddr;

	int ret = 0;

	u64 page_start = (u64)page->index << PAGE_CACHE_SHIFT;

	size_t offset = start - page_start;

	if (btrfs_test_opt(root, NODATASUM) ||

	    btrfs_test_flag(inode, NODATASUM))

		return 0;

	mutex_lock(&root->fs_info->fs_mutex);

	trans = btrfs_start_transaction(root, 1);

	btrfs_set_trans_block_group(trans, inode);

	kaddr = kmap(page);

	btrfs_csum_file_block(trans, root, inode, inode->i_ino,

			      start, kaddr + offset, end - start + 1);

	kunmap(page);

	ret = btrfs_end_transaction(trans, root);

	BUG_ON(ret);

	mutex_unlock(&root->fs_info->fs_mutex);

	return ret;

}

#endif

int btrfs_readpage_io_hook(struct page *page, u64 start, u64 end)

int btrfs_readpage_io_hook(struct page *page, u64 start, u64 end)

{

{

	int ret = 0;

	int ret = 0;
@@ -3049,7 +3023,6 @@ static struct file_operations btrfs_dir_file_operations = { 




static struct extent_io_ops btrfs_extent_io_ops = {

static struct extent_io_ops btrfs_extent_io_ops = {

	.fill_delalloc = run_delalloc_range,

	.fill_delalloc = run_delalloc_range,

	// .writepage_io_hook = btrfs_writepage_io_hook,

	.submit_bio_hook = btrfs_submit_bio_hook,

	.submit_bio_hook = btrfs_submit_bio_hook,

	.readpage_io_hook = btrfs_readpage_io_hook,

	.readpage_io_hook = btrfs_readpage_io_hook,

	.readpage_end_io_hook = btrfs_readpage_end_io_hook,

	.readpage_end_io_hook = btrfs_readpage_end_io_hook,

fs/btrfs/super.c

+10 −1
Original line number Original line Diff line number Diff line
@@ -272,6 +272,11 @@ static int btrfs_fill_super(struct super_block * sb, void * data, int silent) 




	sb->s_root = root_dentry;

	sb->s_root = root_dentry;

	btrfs_transaction_queue_work(tree_root, HZ * 30);

	btrfs_transaction_queue_work(tree_root, HZ * 30);



#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)

	save_mount_options(sb, data);

#endif



	return 0;

	return 0;





fail_close:

fail_close:
@@ -462,9 +467,13 @@ static struct super_operations btrfs_super_ops = { 
	.delete_inode	= btrfs_delete_inode,

	.delete_inode	= btrfs_delete_inode,

	.put_inode	= btrfs_put_inode,

	.put_inode	= btrfs_put_inode,

	.put_super	= btrfs_put_super,

	.put_super	= btrfs_put_super,

	.read_inode	= btrfs_read_locked_inode,

	.write_super	= btrfs_write_super,

	.write_super	= btrfs_write_super,

	.sync_fs	= btrfs_sync_fs,

	.sync_fs	= btrfs_sync_fs,

#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)

	.read_inode     = btrfs_read_locked_inode,

#else

	.show_options	= generic_show_options,

#endif

	.write_inode	= btrfs_write_inode,

	.write_inode	= btrfs_write_inode,

	.dirty_inode	= btrfs_dirty_inode,

	.dirty_inode	= btrfs_dirty_inode,

	.alloc_inode	= btrfs_alloc_inode,

	.alloc_inode	= btrfs_alloc_inode,