RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Btrfs-progs: make the repair option a global static var 

It's just annoying to have to pass it around everywhere.  Thanks,

Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
This commit is contained in:
Josef Bacik 2013-09-30 16:15:22 -04:00 committed by Chris Mason
parent 1fdf85a3a3
commit 016e698a37
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cmds-check.c
View File

@ -49,6 +49,7 @@ static u64 data_bytes_allocated = 0;
static u64 data_bytes_referenced = 0;
static int found_old_backref = 0;
static LIST_HEAD(duplicate_extents);
static int repair = 0;
struct extent_backref {
struct list_head list;
@ -1404,7 +1405,7 @@ out:
}
static int check_inode_recs(struct btrfs_root *root,
struct cache_tree *inode_cache, int repair)
struct cache_tree *inode_cache)
{
struct cache_extent *cache;
struct ptr_node *node;
@ -1809,7 +1810,7 @@ static int process_root_ref(struct extent_buffer *eb, int slot,
static int check_fs_root(struct btrfs_root *root,
struct cache_tree *root_cache,
struct walk_control *wc, int repair)
struct walk_control *wc)
{
int ret = 0;
int wret;
@ -1879,7 +1880,7 @@ static int check_fs_root(struct btrfs_root *root,
root_node.current);
}
ret = check_inode_recs(root, &root_node.inode_cache, repair);
ret = check_inode_recs(root, &root_node.inode_cache);
return ret;
}
@ -1895,8 +1896,7 @@ static int fs_root_objectid(u64 objectid)
}
static int check_fs_roots(struct btrfs_root *root,
struct cache_tree *root_cache,
int repair)
struct cache_tree *root_cache)
{
struct btrfs_path path;
struct btrfs_key key;
@ -1939,7 +1939,7 @@ static int check_fs_roots(struct btrfs_root *root,
err = 1;
goto next;
}
ret = check_fs_root(tmp_root, root_cache, &wc, repair);
ret = check_fs_root(tmp_root, root_cache, &wc);
if (ret)
err = 1;
btrfs_free_fs_root(tmp_root);
@ -5014,7 +5014,7 @@ static void reset_cached_block_groups(struct btrfs_fs_info *fs_info)
static int check_extent_refs(struct btrfs_trans_handle *trans,
struct btrfs_root *root,
struct cache_tree *extent_cache, int repair)
struct cache_tree *extent_cache)
{
struct extent_record *rec;
struct cache_extent *cache;
@ -5408,7 +5408,7 @@ static int check_devices(struct rb_root *dev_cache,
return ret;
}
static int check_chunks_and_extents(struct btrfs_root *root, int repair)
static int check_chunks_and_extents(struct btrfs_root *root)
{
struct rb_root dev_cache;
struct cache_tree chunk_cache;
@ -5515,7 +5515,7 @@ again:
break;
}
ret = check_extent_refs(trans, root, &extent_cache, repair);
ret = check_extent_refs(trans, root, &extent_cache);
if (ret == -EAGAIN) {
ret = btrfs_commit_transaction(trans, root);
if (ret)
@ -5986,7 +5986,6 @@ int cmd_check(int argc, char **argv)
char uuidbuf[37];
int ret;
int num;
int repair = 0;
int option_index = 0;
int init_csum_tree = 0;
int init_extent_tree = 0;
@ -6088,7 +6087,7 @@ int cmd_check(int argc, char **argv)
exit(1);
goto out;
}
ret = check_chunks_and_extents(root, repair);
ret = check_chunks_and_extents(root);
if (ret)
fprintf(stderr, "Errors found in extent allocation tree or chunk allocation\n");
@ -6098,7 +6097,7 @@ int cmd_check(int argc, char **argv)
goto out;
fprintf(stderr, "checking fs roots\n");
ret = check_fs_roots(root, &root_cache, repair);
ret = check_fs_roots(root, &root_cache);
if (ret)
goto out;