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

Commit 48fe37cb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block 

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  blk-cgroup: Fix an RCU warning in blkiocg_create()
  blk-cgroup: Fix RCU correctness warning in cfq_init_queue()
  drbd: don't expose failed local READ to upper layers
parents e33b3e75 0341509f

block/blk-cgroup.c

+4 −4
Original line number Diff line number Diff line
@@ -286,16 +286,16 @@ static void blkiocg_destroy(struct cgroup_subsys *subsys, struct cgroup *cgroup) 
static struct cgroup_subsys_state *

blkiocg_create(struct cgroup_subsys *subsys, struct cgroup *cgroup)

{

	struct blkio_cgroup *blkcg, *parent_blkcg;

	struct blkio_cgroup *blkcg;

	struct cgroup *parent = cgroup->parent;



	if (!cgroup->parent) {

	if (!parent) {

		blkcg = &blkio_root_cgroup;

		goto done;

	}



	/* Currently we do not support hierarchy deeper than two level (0,1) */

	parent_blkcg = cgroup_to_blkio_cgroup(cgroup->parent);

	if (css_depth(&parent_blkcg->css) > 0)

	if (parent != cgroup->top_cgroup)

		return ERR_PTR(-EINVAL);



	blkcg = kzalloc(sizeof(*blkcg), GFP_KERNEL);

block/cfq-iosched.c

+2 −0
Original line number Diff line number Diff line
@@ -3694,8 +3694,10 @@ static void *cfq_init_queue(struct request_queue *q) 
	 * to make sure that cfq_put_cfqg() does not try to kfree root group

	 */

	atomic_set(&cfqg->ref, 1);

	rcu_read_lock();

	blkiocg_add_blkio_group(&blkio_root_cgroup, &cfqg->blkg, (void *)cfqd,

					0);

	rcu_read_unlock();

#endif

	/*

	 * Not strictly needed (since RB_ROOT just clears the node and we

drivers/block/drbd/drbd_worker.c

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ void drbd_endio_pri(struct bio *bio, int error) 
	if (unlikely(error)) {

		what = (bio_data_dir(bio) == WRITE)

			? write_completed_with_error

			: (bio_rw(bio) == READA)

			: (bio_rw(bio) == READ)

			  ? read_completed_with_error

			  : read_ahead_completed_with_error;

	} else