diff options
author | Chris Mason <clm@fb.com> | 2015-03-25 10:43:16 -0700 |
---|---|---|
committer | Chris Mason <clm@fb.com> | 2015-03-25 10:43:16 -0700 |
commit | 9deed229fa8a83bb5cd713b2d2a8e5c022a4b45b (patch) | |
tree | a98200a7176d8066099fde32e9691c7c36f66b1e /fs/btrfs/qgroup.c | |
parent | bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff) | |
parent | 258ece02126a67af263746e1ae5f8ddf0d492e14 (diff) | |
download | op-kernel-dev-9deed229fa8a83bb5cd713b2d2a8e5c022a4b45b.zip op-kernel-dev-9deed229fa8a83bb5cd713b2d2a8e5c022a4b45b.tar.gz |
Merge branch 'cleanups-for-4.1-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.1
Diffstat (limited to 'fs/btrfs/qgroup.c')
-rw-r--r-- | fs/btrfs/qgroup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index 058c79e..e08d26a 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -1845,7 +1845,7 @@ static int qgroup_shared_accounting(struct btrfs_trans_handle *trans, struct ulist *roots = NULL; struct ulist *qgroups, *tmp; struct btrfs_qgroup *qgroup; - struct seq_list elem = {}; + struct seq_list elem = SEQ_LIST_INIT(elem); u64 seq; int old_roots = 0; int new_roots = 0; @@ -1967,7 +1967,7 @@ static int qgroup_subtree_accounting(struct btrfs_trans_handle *trans, int err; struct btrfs_qgroup *qg; u64 root_obj = 0; - struct seq_list elem = {}; + struct seq_list elem = SEQ_LIST_INIT(elem); parents = ulist_alloc(GFP_NOFS); if (!parents) @@ -2522,7 +2522,7 @@ qgroup_rescan_leaf(struct btrfs_fs_info *fs_info, struct btrfs_path *path, { struct btrfs_key found; 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 seq; int new_roots; |