Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3284da7b authored by David Sterba's avatar David Sterba
Browse files

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: default avatarDavid Sterba <dsterba@suse.cz>
parent f64c7b12

fs/btrfs/backref.c

+2 −2
Original line number Diff line number Diff line
@@ -1206,7 +1206,7 @@ int btrfs_check_shared(struct btrfs_trans_handle *trans, 
	struct ulist *roots = NULL;

	struct ulist_iterator uiter;

	struct ulist_node *node;

	struct seq_list elem = {};

	struct seq_list elem = SEQ_LIST_INIT(elem);

	int ret = 0;



	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_node *ref_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 root_uiter;

fs/btrfs/ctree.h

+2 −0
Original line number Diff line number Diff line
@@ -1328,6 +1328,8 @@ struct seq_list { 
	u64 seq;

};



#define SEQ_LIST_INIT(name)	{ .list = LIST_HEAD_INIT((name).list), .seq = 0 }



enum btrfs_orphan_cleanup_state {

	ORPHAN_CLEANUP_STARTED	= 1,

	ORPHAN_CLEANUP_DONE	= 2,

fs/btrfs/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -3039,7 +3039,7 @@ static long btrfs_ioctl_file_extent_same(struct file *file, 
static int check_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,

		     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_iterator uiter;

	struct ulist_node *root_node = NULL;

fs/btrfs/qgroup.c

+3 −3
Original line number Diff line number Diff line
@@ -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;