UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

btrfs: use explicit initializer for seq_elem 

Using {} as initializer for struct seq_elem does not properly initialize
the list_head member, but it currently works because it gets set through
btrfs_get_tree_mod_seq if 'seq' is 0.

Signed-off-by: David Sterba <dsterba@suse.cz>
This commit is contained in:
David Sterba 2015-02-25 15:47:32 +01:00
parent f64c7b12f8
commit 3284da7b7b
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/btrfs/backref.c
View File

@ -1206,7 +1206,7 @@ int btrfs_check_shared(struct btrfs_trans_handle *trans,
struct ulist *roots = NULL; struct ulist *roots = NULL;
struct ulist_iterator uiter; struct ulist_iterator uiter;
struct ulist_node *node; struct ulist_node *node;
struct seq_list elem = {}; struct seq_list elem = SEQ_LIST_INIT(elem);
int ret = 0; int ret = 0;
tmp = ulist_alloc(GFP_NOFS); tmp = ulist_alloc(GFP_NOFS);
@ -1610,7 +1610,7 @@ int iterate_extent_inodes(struct btrfs_fs_info *fs_info,
struct ulist *roots = NULL; struct ulist *roots = NULL;
struct ulist_node *ref_node = NULL; struct ulist_node *ref_node = NULL;
struct ulist_node *root_node = NULL; struct ulist_node *root_node = NULL;
struct seq_list tree_mod_seq_elem = {}; struct seq_list tree_mod_seq_elem = SEQ_LIST_INIT(tree_mod_seq_elem);
struct ulist_iterator ref_uiter; struct ulist_iterator ref_uiter;
struct ulist_iterator root_uiter; struct ulist_iterator root_uiter;

2
fs/btrfs/ctree.h
View File

@ -1328,6 +1328,8 @@ struct seq_list {
u64 seq; u64 seq;
}; };
#define SEQ_LIST_INIT(name) { .list = LIST_HEAD_INIT((name).list), .seq = 0 }
enum btrfs_orphan_cleanup_state { enum btrfs_orphan_cleanup_state {
ORPHAN_CLEANUP_STARTED = 1, ORPHAN_CLEANUP_STARTED = 1,
ORPHAN_CLEANUP_DONE = 2, ORPHAN_CLEANUP_DONE = 2,

2
fs/btrfs/ioctl.c
View File

@ -3039,7 +3039,7 @@ out:
static int check_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root, static int check_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,
u64 disko) u64 disko)
{ {
struct seq_list tree_mod_seq_elem = {}; struct seq_list tree_mod_seq_elem = SEQ_LIST_INIT(tree_mod_seq_elem);
struct ulist *roots; struct ulist *roots;
struct ulist_iterator uiter; struct ulist_iterator uiter;
struct ulist_node *root_node = NULL; struct ulist_node *root_node = NULL;

6
fs/btrfs/qgroup.c
View File

@ -1845,7 +1845,7 @@ static int qgroup_shared_accounting(struct btrfs_trans_handle *trans,
struct ulist *roots = NULL; struct ulist *roots = NULL;
struct ulist *qgroups, *tmp; struct ulist *qgroups, *tmp;
struct btrfs_qgroup *qgroup; struct btrfs_qgroup *qgroup;
struct seq_list elem = {}; struct seq_list elem = SEQ_LIST_INIT(elem);
u64 seq; u64 seq;
int old_roots = 0; int old_roots = 0;
int new_roots = 0; int new_roots = 0;
@ -1967,7 +1967,7 @@ static int qgroup_subtree_accounting(struct btrfs_trans_handle *trans,
int err; int err;
struct btrfs_qgroup *qg; struct btrfs_qgroup *qg;
u64 root_obj = 0; u64 root_obj = 0;
struct seq_list elem = {}; struct seq_list elem = SEQ_LIST_INIT(elem);
parents = ulist_alloc(GFP_NOFS); parents = ulist_alloc(GFP_NOFS);
if (!parents) if (!parents)
@ -2522,7 +2522,7 @@ qgroup_rescan_leaf(struct btrfs_fs_info *fs_info, struct btrfs_path *path,
{ {
struct btrfs_key found; struct btrfs_key found;
struct ulist *roots = NULL; struct ulist *roots = NULL;
struct seq_list tree_mod_seq_elem = {}; struct seq_list tree_mod_seq_elem = SEQ_LIST_INIT(tree_mod_seq_elem);
u64 num_bytes; u64 num_bytes;
u64 seq; u64 seq;
int new_roots; int new_roots;