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

Commit bdf7cf1c 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:
  loop: export module parameters
  block: export blk_{get,put}_queue()
  block: remove unused variable in bio_attempt_front_merge()
  block: always allocate genhd->ev if check_events is implemented
  brd: export module parameters
  brd: fix comment on initial device creation
  brd: handle on-demand devices correctly
  brd: limit 'max_part' module param to DISK_MAX_PARTS
  brd: get rid of unused members from struct brd_device
  block: fix oops on !disk->queue and sysfs discard alignment display
parents 40efeb4d ac04fee0

block/blk-core.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -345,6 +345,7 @@ void blk_put_queue(struct request_queue *q) 
{

{

	kobject_put(&q->kobj);

	kobject_put(&q->kobj);

}

}

EXPORT_SYMBOL(blk_put_queue);





/*

/*

 * Note: If a driver supplied the queue lock, it should not zap that lock

 * Note: If a driver supplied the queue lock, it should not zap that lock
@@ -566,6 +567,7 @@ int blk_get_queue(struct request_queue *q) 




	return 1;

	return 1;

}

}

EXPORT_SYMBOL(blk_get_queue);





static inline void blk_free_request(struct request_queue *q, struct request *rq)

static inline void blk_free_request(struct request_queue *q, struct request *rq)

{

{
@@ -1130,7 +1132,6 @@ static bool bio_attempt_front_merge(struct request_queue *q, 
				    struct request *req, struct bio *bio)

				    struct request *req, struct bio *bio)

{

{

	const int ff = bio->bi_rw & REQ_FAILFAST_MASK;

	const int ff = bio->bi_rw & REQ_FAILFAST_MASK;

	sector_t sector;





	if (!ll_front_merge_fn(q, req, bio))

	if (!ll_front_merge_fn(q, req, bio))

		return false;

		return false;
@@ -1140,8 +1141,6 @@ static bool bio_attempt_front_merge(struct request_queue *q, 
	if ((req->cmd_flags & REQ_FAILFAST_MASK) != ff)

	if ((req->cmd_flags & REQ_FAILFAST_MASK) != ff)

		blk_rq_set_mixed_merge(req);

		blk_rq_set_mixed_merge(req);





	sector = bio->bi_sector;



	bio->bi_next = req->bio;

	bio->bi_next = req->bio;

	req->bio = bio;

	req->bio = bio;

block/genhd.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1728,7 +1728,7 @@ static void disk_add_events(struct gendisk *disk) 
{

{

	struct disk_events *ev;

	struct disk_events *ev;





	if (!disk->fops->check_events || !(disk->events | disk->async_events))

	if (!disk->fops->check_events)

		return;

		return;





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

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

drivers/block/brd.c

+26 −16
Original line number Original line Diff line number Diff line
@@ -35,10 +35,6 @@ 
 */

 */

struct brd_device {

struct brd_device {

	int		brd_number;

	int		brd_number;

	int		brd_refcnt;

	loff_t		brd_offset;

	loff_t		brd_sizelimit;

	unsigned	brd_blocksize;





	struct request_queue	*brd_queue;

	struct request_queue	*brd_queue;

	struct gendisk		*brd_disk;

	struct gendisk		*brd_disk;
@@ -440,11 +436,11 @@ static int rd_nr; 
int rd_size = CONFIG_BLK_DEV_RAM_SIZE;

int rd_size = CONFIG_BLK_DEV_RAM_SIZE;

static int max_part;

static int max_part;

static int part_shift;

static int part_shift;

module_param(rd_nr, int, 0);

module_param(rd_nr, int, S_IRUGO);

MODULE_PARM_DESC(rd_nr, "Maximum number of brd devices");

MODULE_PARM_DESC(rd_nr, "Maximum number of brd devices");

module_param(rd_size, int, 0);

module_param(rd_size, int, S_IRUGO);

MODULE_PARM_DESC(rd_size, "Size of each RAM disk in kbytes.");

MODULE_PARM_DESC(rd_size, "Size of each RAM disk in kbytes.");

module_param(max_part, int, 0);

module_param(max_part, int, S_IRUGO);

MODULE_PARM_DESC(max_part, "Maximum number of partitions per RAM disk");

MODULE_PARM_DESC(max_part, "Maximum number of partitions per RAM disk");

MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");

MODULE_ALIAS_BLOCKDEV_MAJOR(RAMDISK_MAJOR);

MODULE_ALIAS_BLOCKDEV_MAJOR(RAMDISK_MAJOR);
@@ -552,7 +548,7 @@ static struct kobject *brd_probe(dev_t dev, int *part, void *data) 
	struct kobject *kobj;

	struct kobject *kobj;





	mutex_lock(&brd_devices_mutex);

	mutex_lock(&brd_devices_mutex);

	brd = brd_init_one(dev & MINORMASK);

	brd = brd_init_one(MINOR(dev) >> part_shift);

	kobj = brd ? get_disk(brd->brd_disk) : ERR_PTR(-ENOMEM);

	kobj = brd ? get_disk(brd->brd_disk) : ERR_PTR(-ENOMEM);

	mutex_unlock(&brd_devices_mutex);

	mutex_unlock(&brd_devices_mutex);
@@ -575,25 +571,39 @@ static int __init brd_init(void) 
	 *

	 *

	 * (1) if rd_nr is specified, create that many upfront, and this

	 * (1) if rd_nr is specified, create that many upfront, and this

	 *     also becomes a hard limit.

	 *     also becomes a hard limit.

	 * (2) if rd_nr is not specified, create 1 rd device on module

	 * (2) if rd_nr is not specified, create CONFIG_BLK_DEV_RAM_COUNT

	 *     load, user can further extend brd device by create dev node

	 *     (default 16) rd device on module load, user can further

	 *     themselves and have kernel automatically instantiate actual

	 *     extend brd device by create dev node themselves and have

	 *     device on-demand.

	 *     kernel automatically instantiate actual device on-demand.

	 */

	 */





	part_shift = 0;

	part_shift = 0;

	if (max_part > 0)

	if (max_part > 0) {

		part_shift = fls(max_part);

		part_shift = fls(max_part);





		/*

		 * Adjust max_part according to part_shift as it is exported

		 * to user space so that user can decide correct minor number

		 * if [s]he want to create more devices.

		 *

		 * Note that -1 is required because partition 0 is reserved

		 * for the whole disk.

		 */

		max_part = (1UL << part_shift) - 1;

	}



	if ((1UL << part_shift) > DISK_MAX_PARTS)

		return -EINVAL;



	if (rd_nr > 1UL << (MINORBITS - part_shift))

	if (rd_nr > 1UL << (MINORBITS - part_shift))

		return -EINVAL;

		return -EINVAL;





	if (rd_nr) {

	if (rd_nr) {

		nr = rd_nr;

		nr = rd_nr;

		range = rd_nr;

		range = rd_nr << part_shift;

	} else {

	} else {

		nr = CONFIG_BLK_DEV_RAM_COUNT;

		nr = CONFIG_BLK_DEV_RAM_COUNT;

		range = 1UL << (MINORBITS - part_shift);

		range = 1UL << MINORBITS;

	}

	}





	if (register_blkdev(RAMDISK_MAJOR, "ramdisk"))

	if (register_blkdev(RAMDISK_MAJOR, "ramdisk"))
@@ -632,7 +642,7 @@ static void __exit brd_exit(void) 
	unsigned long range;

	unsigned long range;

	struct brd_device *brd, *next;

	struct brd_device *brd, *next;





	range = rd_nr ? rd_nr :  1UL << (MINORBITS - part_shift);

	range = rd_nr ? rd_nr << part_shift : 1UL << MINORBITS;





	list_for_each_entry_safe(brd, next, &brd_devices, brd_list)

	list_for_each_entry_safe(brd, next, &brd_devices, brd_list)

		brd_del_one(brd);

		brd_del_one(brd);

drivers/block/loop.c

+14 −3
Original line number Original line Diff line number Diff line
@@ -1540,9 +1540,9 @@ static const struct block_device_operations lo_fops = { 
 * And now the modules code and kernel interface.

 * And now the modules code and kernel interface.

 */

 */

static int max_loop;

static int max_loop;

module_param(max_loop, int, 0);

module_param(max_loop, int, S_IRUGO);

MODULE_PARM_DESC(max_loop, "Maximum number of loop devices");

MODULE_PARM_DESC(max_loop, "Maximum number of loop devices");

module_param(max_part, int, 0);

module_param(max_part, int, S_IRUGO);

MODULE_PARM_DESC(max_part, "Maximum number of partitions per loop device");

MODULE_PARM_DESC(max_part, "Maximum number of partitions per loop device");

MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");

MODULE_ALIAS_BLOCKDEV_MAJOR(LOOP_MAJOR);

MODULE_ALIAS_BLOCKDEV_MAJOR(LOOP_MAJOR);
@@ -1688,9 +1688,20 @@ static int __init loop_init(void) 
	 */

	 */





	part_shift = 0;

	part_shift = 0;

	if (max_part > 0)

	if (max_part > 0) {

		part_shift = fls(max_part);

		part_shift = fls(max_part);





		/*

		 * Adjust max_part according to part_shift as it is exported

		 * to user space so that user can decide correct minor number

		 * if [s]he want to create more devices.

		 *

		 * Note that -1 is required because partition 0 is reserved

		 * for the whole disk.

		 */

		max_part = (1UL << part_shift) - 1;

	}



	if ((1UL << part_shift) > DISK_MAX_PARTS)

	if ((1UL << part_shift) > DISK_MAX_PARTS)

		return -EINVAL;

		return -EINVAL;

fs/partitions/check.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -256,10 +256,12 @@ ssize_t part_discard_alignment_show(struct device *dev, 
{

{

	struct hd_struct *p = dev_to_part(dev);

	struct hd_struct *p = dev_to_part(dev);

	struct gendisk *disk = dev_to_disk(dev);

	struct gendisk *disk = dev_to_disk(dev);

	unsigned int alignment = 0;





	return sprintf(buf, "%u\n",

	if (disk->queue)

			queue_limit_discard_alignment(&disk->queue->limits,

		alignment = queue_limit_discard_alignment(&disk->queue->limits,

							p->start_sect));

								p->start_sect);

	return sprintf(buf, "%u\n", alignment);

}

}





ssize_t part_stat_show(struct device *dev,

ssize_t part_stat_show(struct device *dev,