Skip to content

Commit ab0fff0

Browse files
author
Arne Jansen
committed
btrfs: add READAHEAD extent buffer flag
Add a READAHEAD extent buffer flag. Add a function to trigger a read with this flag set. Changes v2: - use extent buffer flags instead of extent state flags Changes v5: - adapt to changed read_extent_buffer_pages interface - don't return eb from reada_tree_block_flagged if it has CORRUPT flag set Signed-off-by: Arne Jansen <[email protected]>
1 parent bb82ab8 commit ab0fff0

File tree

3 files changed

+35
-0
lines changed

3 files changed

+35
-0
lines changed

fs/btrfs/disk-io.c

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -980,6 +980,38 @@ int readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize,
980980
return ret;
981981
}
982982

983+
int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr, u32 blocksize,
984+
int mirror_num, struct extent_buffer **eb)
985+
{
986+
struct extent_buffer *buf = NULL;
987+
struct inode *btree_inode = root->fs_info->btree_inode;
988+
struct extent_io_tree *io_tree = &BTRFS_I(btree_inode)->io_tree;
989+
int ret;
990+
991+
buf = btrfs_find_create_tree_block(root, bytenr, blocksize);
992+
if (!buf)
993+
return 0;
994+
995+
set_bit(EXTENT_BUFFER_READAHEAD, &buf->bflags);
996+
997+
ret = read_extent_buffer_pages(io_tree, buf, 0, WAIT_PAGE_LOCK,
998+
btree_get_extent, mirror_num);
999+
if (ret) {
1000+
free_extent_buffer(buf);
1001+
return ret;
1002+
}
1003+
1004+
if (test_bit(EXTENT_BUFFER_CORRUPT, &buf->bflags)) {
1005+
free_extent_buffer(buf);
1006+
return -EIO;
1007+
} else if (extent_buffer_uptodate(io_tree, buf, NULL)) {
1008+
*eb = buf;
1009+
} else {
1010+
free_extent_buffer(buf);
1011+
}
1012+
return 0;
1013+
}
1014+
9831015
struct extent_buffer *btrfs_find_tree_block(struct btrfs_root *root,
9841016
u64 bytenr, u32 blocksize)
9851017
{

fs/btrfs/disk-io.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr,
4040
u32 blocksize, u64 parent_transid);
4141
int readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize,
4242
u64 parent_transid);
43+
int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr, u32 blocksize,
44+
int mirror_num, struct extent_buffer **eb);
4345
struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root,
4446
u64 bytenr, u32 blocksize);
4547
int clean_tree_block(struct btrfs_trans_handle *trans,

fs/btrfs/extent_io.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#define EXTENT_BUFFER_BLOCKING 1
3333
#define EXTENT_BUFFER_DIRTY 2
3434
#define EXTENT_BUFFER_CORRUPT 3
35+
#define EXTENT_BUFFER_READAHEAD 4 /* this got triggered by readahead */
3536

3637
/* these are flags for extent_clear_unlock_delalloc */
3738
#define EXTENT_CLEAR_UNLOCK_PAGE 0x1

0 commit comments

Comments
 (0)