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

Commit 9deed229 authored by Chris Mason's avatar Chris Mason
Browse files

Merge branch 'cleanups-for-4.1-v2' of... 

Merge branch 'cleanups-for-4.1-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.1
parents bc465aa9 258ece02

fs/btrfs/backref.c

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

fs/btrfs/check-integrity.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -2990,8 +2990,8 @@ static void __btrfsic_submit_bio(int rw, struct bio *bio) 
			       (unsigned long long)bio->bi_iter.bi_sector,

			       (unsigned long long)bio->bi_iter.bi_sector,

			       dev_bytenr, bio->bi_bdev);

			       dev_bytenr, bio->bi_bdev);





		mapped_datav = kmalloc(sizeof(*mapped_datav) * bio->bi_vcnt,

		mapped_datav = kmalloc_array(bio->bi_vcnt,

				       GFP_NOFS);

					     sizeof(*mapped_datav), GFP_NOFS);

		if (!mapped_datav)

		if (!mapped_datav)

			goto leave;

			goto leave;

		cur_bytenr = dev_bytenr;

		cur_bytenr = dev_bytenr;

fs/btrfs/compression.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -622,7 +622,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, 
	cb->orig_bio = bio;

	cb->orig_bio = bio;





	nr_pages = DIV_ROUND_UP(compressed_len, PAGE_CACHE_SIZE);

	nr_pages = DIV_ROUND_UP(compressed_len, PAGE_CACHE_SIZE);

	cb->compressed_pages = kzalloc(sizeof(struct page *) * nr_pages,

	cb->compressed_pages = kcalloc(nr_pages, sizeof(struct page *),

				       GFP_NOFS);

				       GFP_NOFS);

	if (!cb->compressed_pages)

	if (!cb->compressed_pages)

		goto fail1;

		goto fail1;

fs/btrfs/ctree.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -578,7 +578,7 @@ tree_mod_log_insert_move(struct btrfs_fs_info *fs_info, 
	if (!tree_mod_need_log(fs_info, eb))

	if (!tree_mod_need_log(fs_info, eb))

		return 0;

		return 0;





	tm_list = kzalloc(nr_items * sizeof(struct tree_mod_elem *), flags);

	tm_list = kcalloc(nr_items, sizeof(struct tree_mod_elem *), flags);

	if (!tm_list)

	if (!tm_list)

		return -ENOMEM;

		return -ENOMEM;
@@ -677,7 +677,7 @@ tree_mod_log_insert_root(struct btrfs_fs_info *fs_info, 




	if (log_removal && btrfs_header_level(old_root) > 0) {

	if (log_removal && btrfs_header_level(old_root) > 0) {

		nritems = btrfs_header_nritems(old_root);

		nritems = btrfs_header_nritems(old_root);

		tm_list = kzalloc(nritems * sizeof(struct tree_mod_elem *),

		tm_list = kcalloc(nritems, sizeof(struct tree_mod_elem *),

				  flags);

				  flags);

		if (!tm_list) {

		if (!tm_list) {

			ret = -ENOMEM;

			ret = -ENOMEM;
@@ -814,7 +814,7 @@ tree_mod_log_eb_copy(struct btrfs_fs_info *fs_info, struct extent_buffer *dst, 
	if (btrfs_header_level(dst) == 0 && btrfs_header_level(src) == 0)

	if (btrfs_header_level(dst) == 0 && btrfs_header_level(src) == 0)

		return 0;

		return 0;





	tm_list = kzalloc(nr_items * 2 * sizeof(struct tree_mod_elem *),

	tm_list = kcalloc(nr_items * 2, sizeof(struct tree_mod_elem *),

			  GFP_NOFS);

			  GFP_NOFS);

	if (!tm_list)

	if (!tm_list)

		return -ENOMEM;

		return -ENOMEM;
@@ -905,8 +905,7 @@ tree_mod_log_free_eb(struct btrfs_fs_info *fs_info, struct extent_buffer *eb) 
		return 0;

		return 0;





	nritems = btrfs_header_nritems(eb);

	nritems = btrfs_header_nritems(eb);

	tm_list = kzalloc(nritems * sizeof(struct tree_mod_elem *),

	tm_list = kcalloc(nritems, sizeof(struct tree_mod_elem *), GFP_NOFS);

			  GFP_NOFS);

	if (!tm_list)

	if (!tm_list)

		return -ENOMEM;

		return -ENOMEM;

fs/btrfs/ctree.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -1329,6 +1329,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,