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

Commit 4550240b authored by Jan Kara's avatar Jan Kara Committed by Gerrit - the friendly Code Review server
Browse files

bdi: Make wb->bdi a proper reference 



Make wb->bdi a proper refcounted reference to bdi for all bdi_writeback
structures except for the one embedded inside struct backing_dev_info.
That will allow us to simplify bdi unregistration.

Change-Id: If9b7e1bd4e1e1f6fcc54d443bc9ec53db3ea7616
Acked-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
Git-commit: 810df54a64fb7841d6511f67818f3e1589c249a2
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git


Signed-off-by: default avatarRitesh Harjani <riteshh@codeaurora.org>
parent 1448b926

mm/backing-dev.c

+11 −2
Original line number Original line Diff line number Diff line
@@ -294,6 +294,8 @@ static int wb_init(struct bdi_writeback *wb, struct backing_dev_info *bdi, 




	memset(wb, 0, sizeof(*wb));

	memset(wb, 0, sizeof(*wb));





	if (wb != &bdi->wb)

		bdi_get(bdi);

	wb->bdi = bdi;

	wb->bdi = bdi;

	wb->last_old_flush = jiffies;

	wb->last_old_flush = jiffies;

	INIT_LIST_HEAD(&wb->b_dirty);

	INIT_LIST_HEAD(&wb->b_dirty);
@@ -313,8 +315,10 @@ static int wb_init(struct bdi_writeback *wb, struct backing_dev_info *bdi, 
	INIT_DELAYED_WORK(&wb->dwork, wb_workfn);

	INIT_DELAYED_WORK(&wb->dwork, wb_workfn);





	wb->congested = wb_congested_get_create(bdi, blkcg_id, gfp);

	wb->congested = wb_congested_get_create(bdi, blkcg_id, gfp);

	if (!wb->congested)

	if (!wb->congested) {

		return -ENOMEM;

		err = -ENOMEM;

		goto out_put_bdi;

	}





	err = fprop_local_init_percpu(&wb->completions, gfp);

	err = fprop_local_init_percpu(&wb->completions, gfp);

	if (err)

	if (err)
@@ -334,6 +338,9 @@ static int wb_init(struct bdi_writeback *wb, struct backing_dev_info *bdi, 
	fprop_local_destroy_percpu(&wb->completions);

	fprop_local_destroy_percpu(&wb->completions);

out_put_cong:

out_put_cong:

	wb_congested_put(wb->congested);

	wb_congested_put(wb->congested);

out_put_bdi:

	if (wb != &bdi->wb)

		bdi_put(bdi);

	return err;

	return err;

}

}
@@ -371,6 +378,8 @@ static void wb_exit(struct bdi_writeback *wb) 




	fprop_local_destroy_percpu(&wb->completions);

	fprop_local_destroy_percpu(&wb->completions);

	wb_congested_put(wb->congested);

	wb_congested_put(wb->congested);

	if (wb != &wb->bdi->wb)

		bdi_put(wb->bdi);

}

}





#ifdef CONFIG_CGROUP_WRITEBACK

#ifdef CONFIG_CGROUP_WRITEBACK