提交 35a3621b 编写于 作者: S Stefan Behrens 提交者: Chris Mason

Btrfs: get rid of sparse warnings

make C=2 fs/btrfs/ CF=-D__CHECK_ENDIAN__

I tried to filter out the warnings for which patches have already
been sent to the mailing list, pending for inclusion in btrfs-next.

All these changes should be obviously safe.
Signed-off-by: NStefan Behrens <sbehrens@giantdisaster.de>
Signed-off-by: NJosef Bacik <jbacik@fusionio.com>
Signed-off-by: NChris Mason <chris.mason@fusionio.com>
上级 18674c6c
...@@ -365,7 +365,7 @@ static int __resolve_indirect_refs(struct btrfs_fs_info *fs_info, ...@@ -365,7 +365,7 @@ static int __resolve_indirect_refs(struct btrfs_fs_info *fs_info,
node = ulist_next(parents, &uiter); node = ulist_next(parents, &uiter);
ref->parent = node ? node->val : 0; ref->parent = node ? node->val : 0;
ref->inode_list = node ? ref->inode_list = node ?
(struct extent_inode_elem *)(uintptr_t)node->aux : 0; (struct extent_inode_elem *)(uintptr_t)node->aux : NULL;
/* additional parents require new refs being added here */ /* additional parents require new refs being added here */
while ((node = ulist_next(parents, &uiter))) { while ((node = ulist_next(parents, &uiter))) {
......
...@@ -2441,7 +2441,7 @@ static int btrfsic_process_written_superblock( ...@@ -2441,7 +2441,7 @@ static int btrfsic_process_written_superblock(
int num_copies; int num_copies;
int mirror_num; int mirror_num;
const char *additional_string = NULL; const char *additional_string = NULL;
struct btrfs_disk_key tmp_disk_key; struct btrfs_disk_key tmp_disk_key = {0};
btrfs_set_disk_key_objectid(&tmp_disk_key, btrfs_set_disk_key_objectid(&tmp_disk_key,
BTRFS_ROOT_ITEM_KEY); BTRFS_ROOT_ITEM_KEY);
......
...@@ -1067,7 +1067,7 @@ __tree_mod_log_oldest_root(struct btrfs_fs_info *fs_info, ...@@ -1067,7 +1067,7 @@ __tree_mod_log_oldest_root(struct btrfs_fs_info *fs_info,
int looped = 0; int looped = 0;
if (!time_seq) if (!time_seq)
return 0; return NULL;
/* /*
* the very last operation that's logged for a root is the replacement * the very last operation that's logged for a root is the replacement
...@@ -1078,7 +1078,7 @@ __tree_mod_log_oldest_root(struct btrfs_fs_info *fs_info, ...@@ -1078,7 +1078,7 @@ __tree_mod_log_oldest_root(struct btrfs_fs_info *fs_info,
tm = tree_mod_log_search_oldest(fs_info, root_logical, tm = tree_mod_log_search_oldest(fs_info, root_logical,
time_seq); time_seq);
if (!looped && !tm) if (!looped && !tm)
return 0; return NULL;
/* /*
* if there are no tree operation for the oldest root, we simply * if there are no tree operation for the oldest root, we simply
* return it. this should only happen if that (old) root is at * return it. this should only happen if that (old) root is at
...@@ -4782,7 +4782,7 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root, ...@@ -4782,7 +4782,7 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root,
* This may release the path, and so you may lose any locks held at the * This may release the path, and so you may lose any locks held at the
* time you call it. * time you call it.
*/ */
int btrfs_prev_leaf(struct btrfs_root *root, struct btrfs_path *path) static int btrfs_prev_leaf(struct btrfs_root *root, struct btrfs_path *path)
{ {
struct btrfs_key key; struct btrfs_key key;
struct btrfs_disk_key found_key; struct btrfs_disk_key found_key;
......
...@@ -3706,6 +3706,9 @@ int btrfs_defrag_file(struct inode *inode, struct file *file, ...@@ -3706,6 +3706,9 @@ int btrfs_defrag_file(struct inode *inode, struct file *file,
u64 newer_than, unsigned long max_pages); u64 newer_than, unsigned long max_pages);
void btrfs_get_block_group_info(struct list_head *groups_list, void btrfs_get_block_group_info(struct list_head *groups_list,
struct btrfs_ioctl_space_info *space); struct btrfs_ioctl_space_info *space);
void update_ioctl_balance_args(struct btrfs_fs_info *fs_info, int lock,
struct btrfs_ioctl_balance_args *bargs);
/* file.c */ /* file.c */
int btrfs_auto_defrag_init(void); int btrfs_auto_defrag_init(void);
......
...@@ -241,7 +241,7 @@ int btrfs_delayed_ref_lock(struct btrfs_trans_handle *trans, ...@@ -241,7 +241,7 @@ int btrfs_delayed_ref_lock(struct btrfs_trans_handle *trans,
return 0; return 0;
} }
static void inline drop_delayed_ref(struct btrfs_trans_handle *trans, static inline void drop_delayed_ref(struct btrfs_trans_handle *trans,
struct btrfs_delayed_ref_root *delayed_refs, struct btrfs_delayed_ref_root *delayed_refs,
struct btrfs_delayed_ref_node *ref) struct btrfs_delayed_ref_node *ref)
{ {
......
...@@ -1433,8 +1433,8 @@ int btrfs_add_log_tree(struct btrfs_trans_handle *trans, ...@@ -1433,8 +1433,8 @@ int btrfs_add_log_tree(struct btrfs_trans_handle *trans,
return 0; return 0;
} }
struct btrfs_root *btrfs_read_tree_root(struct btrfs_root *tree_root, static struct btrfs_root *btrfs_read_tree_root(struct btrfs_root *tree_root,
struct btrfs_key *key) struct btrfs_key *key)
{ {
struct btrfs_root *root; struct btrfs_root *root;
struct btrfs_fs_info *fs_info = tree_root->fs_info; struct btrfs_fs_info *fs_info = tree_root->fs_info;
...@@ -3754,8 +3754,8 @@ static void btrfs_destroy_all_ordered_extents(struct btrfs_fs_info *fs_info) ...@@ -3754,8 +3754,8 @@ static void btrfs_destroy_all_ordered_extents(struct btrfs_fs_info *fs_info)
spin_unlock(&fs_info->ordered_root_lock); spin_unlock(&fs_info->ordered_root_lock);
} }
int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans, static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
struct btrfs_root *root) struct btrfs_root *root)
{ {
struct rb_node *node; struct rb_node *node;
struct btrfs_delayed_ref_root *delayed_refs; struct btrfs_delayed_ref_root *delayed_refs;
......
...@@ -2954,11 +2954,11 @@ static void __extent_readpages(struct extent_io_tree *tree, ...@@ -2954,11 +2954,11 @@ static void __extent_readpages(struct extent_io_tree *tree,
struct bio **bio, int mirror_num, struct bio **bio, int mirror_num,
unsigned long *bio_flags, int rw) unsigned long *bio_flags, int rw)
{ {
u64 start; u64 start = 0;
u64 end = 0; u64 end = 0;
u64 page_start; u64 page_start;
int index; int index;
int first_index; int first_index = 0;
for (index = 0; index < nr_pages; index++) { for (index = 0; index < nr_pages; index++) {
page_start = page_offset(pages[index]); page_start = page_offset(pages[index]);
......
...@@ -54,8 +54,8 @@ struct fs_path { ...@@ -54,8 +54,8 @@ struct fs_path {
char *buf; char *buf;
int buf_len; int buf_len;
int reversed:1; unsigned int reversed:1;
int virtual_mem:1; unsigned int virtual_mem:1;
char inline_buf[]; char inline_buf[];
}; };
char pad[PAGE_SIZE]; char pad[PAGE_SIZE];
......
...@@ -3076,9 +3076,6 @@ static void __cancel_balance(struct btrfs_fs_info *fs_info) ...@@ -3076,9 +3076,6 @@ static void __cancel_balance(struct btrfs_fs_info *fs_info)
atomic_set(&fs_info->mutually_exclusive_operation_running, 0); atomic_set(&fs_info->mutually_exclusive_operation_running, 0);
} }
void update_ioctl_balance_args(struct btrfs_fs_info *fs_info, int lock,
struct btrfs_ioctl_balance_args *bargs);
/* /*
* Should be called with both balance and volume mutexes held * Should be called with both balance and volume mutexes held
*/ */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册