redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

btrfs: use proper type for failrec in extent_state

Browse source 
We use the private member of extent_state to store the failrec and play
pointless pointer games.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2016-02-11 13:24:13 +01:00
parent 04b285f35e
commit 47dc196ae7
2 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
fs/btrfs/extent_io.c
View file

@ -232,7 +232,7 @@ static struct extent_state *alloc_extent_state(gfp_t mask)
if (!state) if (!state)
return state; return state;
state->state = 0; state->state = 0;
state->private = 0; state->failrec = NULL;
RB_CLEAR_NODE(&state->rb_node); RB_CLEAR_NODE(&state->rb_node);
btrfs_leak_debug_add(&state->leak_list, &states); btrfs_leak_debug_add(&state->leak_list, &states);
atomic_set(&state->refs, 1); atomic_set(&state->refs, 1);
@ -1844,7 +1844,8 @@ out:
* set the private field for a given byte offset in the tree. If there isn't * set the private field for a given byte offset in the tree. If there isn't
* an extent_state there already, this does nothing. * an extent_state there already, this does nothing.
*/ */
static int set_state_private(struct extent_io_tree *tree, u64 start, u64 private) static int set_state_failrec(struct extent_io_tree *tree, u64 start,
struct io_failure_record *failrec)
{ {
struct rb_node *node; struct rb_node *node;
struct extent_state *state; struct extent_state *state;
@ -1865,13 +1866,14 @@ static int set_state_private(struct extent_io_tree *tree, u64 start, u64 private
ret = -ENOENT; ret = -ENOENT;
goto out; goto out;
} }
state->private = private; state->failrec = failrec;
out: out:
spin_unlock(&tree->lock); spin_unlock(&tree->lock);
return ret; return ret;
} }
int get_state_private(struct extent_io_tree *tree, u64 start, u64 *private) static int get_state_failrec(struct extent_io_tree *tree, u64 start,
struct io_failure_record **failrec)
{ {
struct rb_node *node; struct rb_node *node;
struct extent_state *state; struct extent_state *state;
@ -1892,7 +1894,7 @@ int get_state_private(struct extent_io_tree *tree, u64 start, u64 *private)
ret = -ENOENT; ret = -ENOENT;
goto out; goto out;
} }
*private = state->private; *failrec = state->failrec;
out: out:
spin_unlock(&tree->lock); spin_unlock(&tree->lock);
return ret; return ret;
@ -1972,7 +1974,7 @@ int free_io_failure(struct inode *inode, struct io_failure_record *rec)
int err = 0; int err = 0;
struct extent_io_tree *failure_tree = &BTRFS_I(inode)->io_failure_tree; struct extent_io_tree *failure_tree = &BTRFS_I(inode)->io_failure_tree;
set_state_private(failure_tree, rec->start, 0); set_state_failrec(failure_tree, rec->start, NULL);
ret = clear_extent_bits(failure_tree, rec->start, ret = clear_extent_bits(failure_tree, rec->start,
rec->start + rec->len - 1, rec->start + rec->len - 1,
EXTENT_LOCKED | EXTENT_DIRTY, GFP_NOFS); EXTENT_LOCKED | EXTENT_DIRTY, GFP_NOFS);
@ -2089,7 +2091,6 @@ int clean_io_failure(struct inode *inode, u64 start, struct page *page,
unsigned int pg_offset) unsigned int pg_offset)
{ {
u64 private; u64 private;
u64 private_failure;
struct io_failure_record *failrec; struct io_failure_record *failrec;
struct btrfs_fs_info *fs_info = BTRFS_I(inode)->root->fs_info; struct btrfs_fs_info *fs_info = BTRFS_I(inode)->root->fs_info;
struct extent_state *state; struct extent_state *state;
@ -2102,12 +2103,11 @@ int clean_io_failure(struct inode *inode, u64 start, struct page *page,
if (!ret) if (!ret)
return 0; return 0;
ret = get_state_private(&BTRFS_I(inode)->io_failure_tree, start, ret = get_state_failrec(&BTRFS_I(inode)->io_failure_tree, start,
&private_failure); &failrec);
if (ret) if (ret)
return 0; return 0;
failrec = (struct io_failure_record *)(unsigned long) private_failure;
BUG_ON(!failrec->this_mirror); BUG_ON(!failrec->this_mirror);
if (failrec->in_validation) { if (failrec->in_validation) {
@ -2167,7 +2167,7 @@ void btrfs_free_io_failure_record(struct inode *inode, u64 start, u64 end)
next = next_state(state); next = next_state(state);
failrec = (struct io_failure_record *)(unsigned long)state->private; failrec = state->failrec;
free_extent_state(state); free_extent_state(state);
kfree(failrec); kfree(failrec);
@ -2177,10 +2177,9 @@ void btrfs_free_io_failure_record(struct inode *inode, u64 start, u64 end)
} }
int btrfs_get_io_failure_record(struct inode *inode, u64 start, u64 end, int btrfs_get_io_failure_record(struct inode *inode, u64 start, u64 end,
struct io_failure_record **failrec_ret) struct io_failure_record **failrec_ret)
{ {
struct io_failure_record *failrec; struct io_failure_record *failrec;
u64 private;
struct extent_map *em; struct extent_map *em;
struct extent_io_tree *failure_tree = &BTRFS_I(inode)->io_failure_tree; struct extent_io_tree *failure_tree = &BTRFS_I(inode)->io_failure_tree;
struct extent_io_tree *tree = &BTRFS_I(inode)->io_tree; struct extent_io_tree *tree = &BTRFS_I(inode)->io_tree;
@ -2188,7 +2187,7 @@ int btrfs_get_io_failure_record(struct inode *inode, u64 start, u64 end,
int ret; int ret;
u64 logical; u64 logical;
ret = get_state_private(failure_tree, start, &private); ret = get_state_failrec(failure_tree, start, &failrec);
if (ret) { if (ret) {
failrec = kzalloc(sizeof(*failrec), GFP_NOFS); failrec = kzalloc(sizeof(*failrec), GFP_NOFS);
if (!failrec) if (!failrec)
@ -2237,8 +2236,7 @@ int btrfs_get_io_failure_record(struct inode *inode, u64 start, u64 end,
ret = set_extent_bits(failure_tree, start, end, ret = set_extent_bits(failure_tree, start, end,
EXTENT_LOCKED | EXTENT_DIRTY, GFP_NOFS); EXTENT_LOCKED | EXTENT_DIRTY, GFP_NOFS);
if (ret >= 0) if (ret >= 0)
ret = set_state_private(failure_tree, start, ret = set_state_failrec(failure_tree, start, failrec);
(u64)(unsigned long)failrec);
/* set the bits in the inode's tree */ /* set the bits in the inode's tree */
if (ret >= 0) if (ret >= 0)
ret = set_extent_bits(tree, start, end, EXTENT_DAMAGED, ret = set_extent_bits(tree, start, end, EXTENT_DAMAGED,
@ -2248,7 +2246,6 @@ int btrfs_get_io_failure_record(struct inode *inode, u64 start, u64 end,
return ret; return ret;
} }
} else { } else {
failrec = (struct io_failure_record *)(unsigned long)private;
pr_debug("Get IO Failure Record: (found) logical=%llu, start=%llu, len=%llu, validation=%d\n", pr_debug("Get IO Failure Record: (found) logical=%llu, start=%llu, len=%llu, validation=%d\n",
failrec->logical, failrec->start, failrec->len, failrec->logical, failrec->start, failrec->len,
failrec->in_validation); failrec->in_validation);

5
fs/btrfs/extent_io.h
View file

@ -62,6 +62,7 @@
struct extent_state; struct extent_state;
struct btrfs_root; struct btrfs_root;
struct btrfs_io_bio; struct btrfs_io_bio;
struct io_failure_record;
typedef int (extent_submit_bio_hook_t)(struct inode *inode, int rw, typedef int (extent_submit_bio_hook_t)(struct inode *inode, int rw,
struct bio *bio, int mirror_num, struct bio *bio, int mirror_num,
@ -112,8 +113,7 @@ struct extent_state {
atomic_t refs; atomic_t refs;
unsigned state; unsigned state;
/* for use by the FS */ struct io_failure_record *failrec;
u64 private;
#ifdef CONFIG_BTRFS_DEBUG #ifdef CONFIG_BTRFS_DEBUG
struct list_head leak_list; struct list_head leak_list;
@ -345,7 +345,6 @@ int extent_readpages(struct extent_io_tree *tree,
get_extent_t get_extent); get_extent_t get_extent);
int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
__u64 start, __u64 len, get_extent_t *get_extent); __u64 start, __u64 len, get_extent_t *get_extent);
int get_state_private(struct extent_io_tree *tree, u64 start, u64 *private);
void set_page_extent_mapped(struct page *page); void set_page_extent_mapped(struct page *page);
struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info, struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,