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

Commit 31583d6a 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:
  Fix kernel-doc parameter name typo in blk-settings.c:
  block: rename CONFIG_LBD to CONFIG_LBDAF
  block: Fix bounce_pfn setting
  hd: stop defining MAJOR_NR
parents ee37ba7a f740f5ca

Documentation/SubmitChecklist

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ kernel patches. 
    CONFIG_PREEMPT.



14: If the patch affects IO/Disk, etc: has been tested with and without

    CONFIG_LBD.

    CONFIG_LBDAF.



15: All codepaths have been exercised with all lockdep features enabled.

Documentation/ja_JP/SubmitChecklist

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ Linux カーネルパッチ投稿者向けチェックリスト 
    ビルドした上、動作確認を行ってください。



14: もしパッチがディスクのI/O性能などに影響を与えるようであれば、

    'CONFIG_LBD'オプションを有効にした場合と無効にした場合の両方で

    'CONFIG_LBDAF'オプションを有効にした場合と無効にした場合の両方で

    テストを実施してみてください。



15: lockdepの機能を全て有効にした上で、全てのコードパスを評価してください。

block/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ menuconfig BLOCK 


if BLOCK



config LBD

	bool "Support for large block devices and files"

config LBDAF

	bool "Support for large (2TB+) block devices and files"

	depends on !64BIT

	default y

	help

block/blk-settings.c

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ EXPORT_SYMBOL_GPL(blk_queue_lld_busy); 


/**

 * blk_set_default_limits - reset limits to default values

 * @limits:  the queue_limits structure to reset

 * @lim:  the queue_limits structure to reset

 *

 * Description:

 *   Returns a queue_limit struct to its default state.  Can be used by
@@ -112,7 +112,7 @@ void blk_set_default_limits(struct queue_limits *lim) 
	lim->max_segment_size = MAX_SEGMENT_SIZE;

	lim->max_sectors = lim->max_hw_sectors = SAFE_MAX_SECTORS;

	lim->logical_block_size = lim->physical_block_size = lim->io_min = 512;

	lim->bounce_pfn = BLK_BOUNCE_ANY;

	lim->bounce_pfn = (unsigned long)(BLK_BOUNCE_ANY >> PAGE_SHIFT);

	lim->alignment_offset = 0;

	lim->io_opt = 0;

	lim->misaligned = 0;

drivers/block/hd.c

+4 −6
Original line number Diff line number Diff line
@@ -100,8 +100,6 @@ static DEFINE_SPINLOCK(hd_lock); 
static struct request_queue *hd_queue;

static struct request *hd_req;



#define MAJOR_NR HD_MAJOR



#define TIMEOUT_VALUE	(6*HZ)

#define	HD_DELAY	0
@@ -712,12 +710,12 @@ static int __init hd_init(void) 
{

	int drive;



	if (register_blkdev(MAJOR_NR, "hd"))

	if (register_blkdev(HD_MAJOR, "hd"))

		return -1;



	hd_queue = blk_init_queue(do_hd_request, &hd_lock);

	if (!hd_queue) {

		unregister_blkdev(MAJOR_NR, "hd");

		unregister_blkdev(HD_MAJOR, "hd");

		return -ENOMEM;

	}
@@ -751,7 +749,7 @@ static int __init hd_init(void) 
		struct hd_i_struct *p = &hd_info[drive];

		if (!disk)

			goto Enomem;

		disk->major = MAJOR_NR;

		disk->major = HD_MAJOR;

		disk->first_minor = drive << 6;

		disk->fops = &hd_fops;

		sprintf(disk->disk_name, "hd%c", 'a'+drive);
@@ -795,7 +793,7 @@ static int __init hd_init(void) 
	NR_HD = 0;

out:

	del_timer(&device_timer);

	unregister_blkdev(MAJOR_NR, "hd");

	unregister_blkdev(HD_MAJOR, "hd");

	blk_cleanup_queue(hd_queue);

	return -1;

Enomem: