lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Btrfs: remove unused extent io tree ops V2

Browse Source 
Nobody uses these io tree ops anymore so just remove them and clean up the code
a bit.  Thanks,

Signed-off-by: Josef Bacik <jbacik@fusionio.com>
This commit is contained in:
Josef Bacik
2013-02-11 11:33:00 -05:00
parent 210549ebe9
commit c8f2f24bd5
2 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
fs/btrfs/extent_io.c
View File

@@ -2646,6 +2646,8 @@ static int __extent_read_full_page(struct extent_io_tree *tree,
} }
} }
while (cur <= end) { while (cur <= end) {
unsigned long pnr = (last_byte >> PAGE_CACHE_SHIFT) + 1;
if (cur >= last_byte) { if (cur >= last_byte) {
char *userpage; char *userpage;
struct extent_state *cached = NULL; struct extent_state *cached = NULL;
@@ -2733,26 +2735,17 @@ static int __extent_read_full_page(struct extent_io_tree *tree,
continue; continue;
} }
ret = 0; pnr -= page->index;
if (tree->ops && tree->ops->readpage_io_hook) { ret = submit_extent_page(READ, tree, page,
ret = tree->ops->readpage_io_hook(page, cur,
cur + iosize - 1);
}
if (!ret) {
unsigned long pnr = (last_byte >> PAGE_CACHE_SHIFT) + 1;
pnr -= page->index;
ret = submit_extent_page(READ, tree, page,
sector, disk_io_size, pg_offset, sector, disk_io_size, pg_offset,
bdev, bio, pnr, bdev, bio, pnr,
end_bio_extent_readpage, mirror_num, end_bio_extent_readpage, mirror_num,
*bio_flags, *bio_flags,
this_bio_flag); this_bio_flag);
if (!ret) { if (!ret) {
nr++; nr++;
*bio_flags = this_bio_flag; *bio_flags = this_bio_flag;
} } else {
}
if (ret) {
SetPageError(page); SetPageError(page);
unlock_extent(tree, cur, cur + iosize - 1); unlock_extent(tree, cur, cur + iosize - 1);
} }
@@ -3441,15 +3434,9 @@ retry:
* swizzled back from swapper_space to tmpfs file * swizzled back from swapper_space to tmpfs file
* mapping * mapping
*/ */
if (tree->ops && if (!trylock_page(page)) {
tree->ops->write_cache_pages_lock_hook) { flush_fn(data);
tree->ops->write_cache_pages_lock_hook(page, lock_page(page);
data, flush_fn);
} else {
if (!trylock_page(page)) {
flush_fn(data);
lock_page(page);
}
} }
if (unlikely(page->mapping != mapping)) { if (unlikely(page->mapping != mapping)) {

3
fs/btrfs/extent_io.h
View File

@@ -75,7 +75,6 @@ struct extent_io_ops {
int (*merge_bio_hook)(struct page *page, unsigned long offset, int (*merge_bio_hook)(struct page *page, unsigned long offset,
size_t size, struct bio *bio, size_t size, struct bio *bio,
unsigned long bio_flags); unsigned long bio_flags);
int (*readpage_io_hook)(struct page *page, u64 start, u64 end);
int (*readpage_io_failed_hook)(struct page *page, int failed_mirror); int (*readpage_io_failed_hook)(struct page *page, int failed_mirror);
int (*readpage_end_io_hook)(struct page *page, u64 start, u64 end, int (*readpage_end_io_hook)(struct page *page, u64 start, u64 end,
struct extent_state *state, int mirror); struct extent_state *state, int mirror);
@@ -90,8 +89,6 @@ struct extent_io_ops {
struct extent_state *other); struct extent_state *other);
void (*split_extent_hook)(struct inode *inode, void (*split_extent_hook)(struct inode *inode,
struct extent_state *orig, u64 split); struct extent_state *orig, u64 split);
int (*write_cache_pages_lock_hook)(struct page *page, void *data,
void (*flush_fn)(void *));
}; };
struct extent_io_tree { struct extent_io_tree {