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

Commit b4fdcb02 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-block 

* 'for-3.2/core' of git://git.kernel.dk/linux-block: (29 commits)
  block: don't call blk_drain_queue() if elevator is not up
  blk-throttle: use queue_is_locked() instead of lockdep_is_held()
  blk-throttle: Take blkcg->lock while traversing blkcg->policy_list
  blk-throttle: Free up policy node associated with deleted rule
  block: warn if tag is greater than real_max_depth.
  block: make gendisk hold a reference to its queue
  blk-flush: move the queue kick into
  blk-flush: fix invalid BUG_ON in blk_insert_flush
  block: Remove the control of complete cpu from bio.
  block: fix a typo in the blk-cgroup.h file
  block: initialize the bounce pool if high memory may be added later
  block: fix request_queue lifetime handling by making blk_queue_cleanup() properly shutdown
  block: drop @tsk from attempt_plug_merge() and explain sync rules
  block: make get_request[_wait]() fail if queue is dead
  block: reorganize throtl_get_tg() and blk_throtl_bio()
  block: reorganize queue draining
  block: drop unnecessary blk_get/put_queue() in scsi_cmd_ioctl() and blk_get_tg()
  block: pass around REQ_* flags instead of broken down booleans during request alloc/free
  block: move blk_throtl prototypes to block/blk.h
  block: fix genhd refcounting in blkio_policy_parse_and_set()
  ...

Fix up trivial conflicts due to "mddev_t" -> "struct mddev" conversion
and making the request functions be of type "void" instead of "int" in
 - drivers/md/{faulty.c,linear.c,md.c,md.h,multipath.c,raid0.c,raid1.c,raid10.c,raid5.c}
 - drivers/staging/zram/zram_drv.c
parents 044595d4 6dd9ad7d

arch/m68k/emu/nfblock.c

+1 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ struct nfhd_device { 
	struct gendisk *disk;

};



static int nfhd_make_request(struct request_queue *queue, struct bio *bio)

static void nfhd_make_request(struct request_queue *queue, struct bio *bio)

{

	struct nfhd_device *dev = queue->queuedata;

	struct bio_vec *bvec;
@@ -76,7 +76,6 @@ static int nfhd_make_request(struct request_queue *queue, struct bio *bio) 
		sec += len;

	}

	bio_endio(bio, 0);

	return 0;

}



static int nfhd_getgeo(struct block_device *bdev, struct hd_geometry *geo)

arch/powerpc/sysdev/axonram.c

+2 −6
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ axon_ram_irq_handler(int irq, void *dev) 
 * axon_ram_make_request - make_request() method for block device

 * @queue, @bio: see blk_queue_make_request()

 */

static int

static void

axon_ram_make_request(struct request_queue *queue, struct bio *bio)

{

	struct axon_ram_bank *bank = bio->bi_bdev->bd_disk->private_data;
@@ -113,7 +113,6 @@ axon_ram_make_request(struct request_queue *queue, struct bio *bio) 
	struct bio_vec *vec;

	unsigned int transfered;

	unsigned short idx;

	int rc = 0;



	phys_mem = bank->io_addr + (bio->bi_sector << AXON_RAM_SECTOR_SHIFT);

	phys_end = bank->io_addr + bank->size;
@@ -121,8 +120,7 @@ axon_ram_make_request(struct request_queue *queue, struct bio *bio) 
	bio_for_each_segment(vec, bio, idx) {

		if (unlikely(phys_mem + vec->bv_len > phys_end)) {

			bio_io_error(bio);

			rc = -ERANGE;

			break;

			return;

		}



		user_mem = page_address(vec->bv_page) + vec->bv_offset;
@@ -135,8 +133,6 @@ axon_ram_make_request(struct request_queue *queue, struct bio *bio) 
		transfered += vec->bv_len;

	}

	bio_endio(bio, 0);



	return rc;

}



/**

block/blk-cgroup.c

+64 −47
Original line number Diff line number Diff line
@@ -768,25 +768,14 @@ static uint64_t blkio_get_stat(struct blkio_group *blkg, 
	return disk_total;

}



static int blkio_check_dev_num(dev_t dev)

{

	int part = 0;

	struct gendisk *disk;



	disk = get_gendisk(dev, &part);

	if (!disk || part)

		return -ENODEV;



	return 0;

}



static int blkio_policy_parse_and_set(char *buf,

	struct blkio_policy_node *newpn, enum blkio_policy_id plid, int fileid)

{

	struct gendisk *disk = NULL;

	char *s[4], *p, *major_s = NULL, *minor_s = NULL;

	int ret;

	unsigned long major, minor;

	int i = 0;

	int i = 0, ret = -EINVAL;

	int part;

	dev_t dev;

	u64 temp;
@@ -804,37 +793,36 @@ static int blkio_policy_parse_and_set(char *buf, 
	}



	if (i != 2)

		return -EINVAL;

		goto out;



	p = strsep(&s[0], ":");

	if (p != NULL)

		major_s = p;

	else

		return -EINVAL;

		goto out;



	minor_s = s[0];

	if (!minor_s)

		return -EINVAL;

		goto out;



	ret = strict_strtoul(major_s, 10, &major);

	if (ret)

		return -EINVAL;

	if (strict_strtoul(major_s, 10, &major))

		goto out;



	ret = strict_strtoul(minor_s, 10, &minor);

	if (ret)

		return -EINVAL;

	if (strict_strtoul(minor_s, 10, &minor))

		goto out;



	dev = MKDEV(major, minor);



	ret = strict_strtoull(s[1], 10, &temp);

	if (ret)

		return -EINVAL;

	if (strict_strtoull(s[1], 10, &temp))

		goto out;



	/* For rule removal, do not check for device presence. */

	if (temp) {

		ret = blkio_check_dev_num(dev);

		if (ret)

			return ret;

		disk = get_gendisk(dev, &part);

		if (!disk || part) {

			ret = -ENODEV;

			goto out;

		}

	}



	newpn->dev = dev;
@@ -843,7 +831,7 @@ static int blkio_policy_parse_and_set(char *buf, 
	case BLKIO_POLICY_PROP:

		if ((temp < BLKIO_WEIGHT_MIN && temp > 0) ||

		     temp > BLKIO_WEIGHT_MAX)

			return -EINVAL;

			goto out;



		newpn->plid = plid;

		newpn->fileid = fileid;
@@ -860,7 +848,7 @@ static int blkio_policy_parse_and_set(char *buf, 
		case BLKIO_THROTL_read_iops_device:

		case BLKIO_THROTL_write_iops_device:

			if (temp > THROTL_IOPS_MAX)

				return -EINVAL;

				goto out;



			newpn->plid = plid;

			newpn->fileid = fileid;
@@ -871,68 +859,96 @@ static int blkio_policy_parse_and_set(char *buf, 
	default:

		BUG();

	}



	return 0;

	ret = 0;

out:

	put_disk(disk);

	return ret;

}



unsigned int blkcg_get_weight(struct blkio_cgroup *blkcg,

			      dev_t dev)

{

	struct blkio_policy_node *pn;

	unsigned long flags;

	unsigned int weight;



	spin_lock_irqsave(&blkcg->lock, flags);



	pn = blkio_policy_search_node(blkcg, dev, BLKIO_POLICY_PROP,

				BLKIO_PROP_weight_device);

	if (pn)

		return pn->val.weight;

		weight = pn->val.weight;

	else

		return blkcg->weight;

		weight = blkcg->weight;



	spin_unlock_irqrestore(&blkcg->lock, flags);



	return weight;

}

EXPORT_SYMBOL_GPL(blkcg_get_weight);



uint64_t blkcg_get_read_bps(struct blkio_cgroup *blkcg, dev_t dev)

{

	struct blkio_policy_node *pn;

	unsigned long flags;

	uint64_t bps = -1;



	spin_lock_irqsave(&blkcg->lock, flags);

	pn = blkio_policy_search_node(blkcg, dev, BLKIO_POLICY_THROTL,

				BLKIO_THROTL_read_bps_device);

	if (pn)

		return pn->val.bps;

	else

		return -1;

		bps = pn->val.bps;

	spin_unlock_irqrestore(&blkcg->lock, flags);



	return bps;

}



uint64_t blkcg_get_write_bps(struct blkio_cgroup *blkcg, dev_t dev)

{

	struct blkio_policy_node *pn;

	unsigned long flags;

	uint64_t bps = -1;



	spin_lock_irqsave(&blkcg->lock, flags);

	pn = blkio_policy_search_node(blkcg, dev, BLKIO_POLICY_THROTL,

				BLKIO_THROTL_write_bps_device);

	if (pn)

		return pn->val.bps;

	else

		return -1;

		bps = pn->val.bps;

	spin_unlock_irqrestore(&blkcg->lock, flags);



	return bps;

}



unsigned int blkcg_get_read_iops(struct blkio_cgroup *blkcg, dev_t dev)

{

	struct blkio_policy_node *pn;

	unsigned long flags;

	unsigned int iops = -1;



	spin_lock_irqsave(&blkcg->lock, flags);

	pn = blkio_policy_search_node(blkcg, dev, BLKIO_POLICY_THROTL,

				BLKIO_THROTL_read_iops_device);

	if (pn)

		return pn->val.iops;

	else

		return -1;

		iops = pn->val.iops;

	spin_unlock_irqrestore(&blkcg->lock, flags);



	return iops;

}



unsigned int blkcg_get_write_iops(struct blkio_cgroup *blkcg, dev_t dev)

{

	struct blkio_policy_node *pn;

	unsigned long flags;

	unsigned int iops = -1;



	spin_lock_irqsave(&blkcg->lock, flags);

	pn = blkio_policy_search_node(blkcg, dev, BLKIO_POLICY_THROTL,

				BLKIO_THROTL_write_iops_device);

	if (pn)

		return pn->val.iops;

	else

		return -1;

		iops = pn->val.iops;

	spin_unlock_irqrestore(&blkcg->lock, flags);



	return iops;

}



/* Checks whether user asked for deleting a policy rule */
@@ -1085,6 +1101,7 @@ static int blkiocg_file_write(struct cgroup *cgrp, struct cftype *cft, 


	if (blkio_delete_rule_command(newpn)) {

		blkio_policy_delete_node(pn);

		kfree(pn);

		spin_unlock_irq(&blkcg->lock);

		goto update_io_group;

	}

block/blk-cgroup.h

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ struct blkio_policy_node { 
	union {

		unsigned int weight;

		/*

		 * Rate read/write in terms of byptes per second

		 * Rate read/write in terms of bytes per second

		 * Whether this rate represents read or write is determined

		 * by file type "fileid".

		 */

block/blk-core.c

+263 −198

File changed.

Preview size limit exceeded, changes collapsed.