aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-19 20:43:04 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-19 20:43:04 -0400
commit31583d6acf940d2951bc8716557b06d9de5a0c4b (patch)
tree607aef385b0998f0cb7ff63b05407afed5182840
parentee37ba7a4212c7420f12e6a2ad8a3966649ede7a (diff)
parentf740f5ca056f0a4eff3abdf272a8a4ba3965d57d (diff)
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
-rw-r--r--Documentation/SubmitChecklist2
-rw-r--r--Documentation/ja_JP/SubmitChecklist2
-rw-r--r--block/Kconfig4
-rw-r--r--block/blk-settings.c4
-rw-r--r--drivers/block/hd.c10
-rw-r--r--drivers/md/dm-exception-store.h2
-rw-r--r--fs/ext3/resize.c2
-rw-r--r--fs/ext3/super.c2
-rw-r--r--fs/ext4/resize.c2
-rw-r--r--fs/ext4/super.c10
-rw-r--r--fs/gfs2/Kconfig2
-rw-r--r--fs/ocfs2/super.c2
-rw-r--r--fs/xfs/linux-2.6/xfs_linux.h2
-rw-r--r--fs/xfs/linux-2.6/xfs_super.c2
-rw-r--r--include/linux/kernel.h2
-rw-r--r--include/linux/types.h2
16 files changed, 25 insertions, 27 deletions
diff --git a/Documentation/SubmitChecklist b/Documentation/SubmitChecklist
index ac5e0b2f1097..78a9168ff377 100644
--- a/Documentation/SubmitChecklist
+++ b/Documentation/SubmitChecklist
@@ -54,7 +54,7 @@ kernel patches.
54 CONFIG_PREEMPT. 54 CONFIG_PREEMPT.
55 55
5614: If the patch affects IO/Disk, etc: has been tested with and without 5614: If the patch affects IO/Disk, etc: has been tested with and without
57 CONFIG_LBD. 57 CONFIG_LBDAF.
58 58
5915: All codepaths have been exercised with all lockdep features enabled. 5915: All codepaths have been exercised with all lockdep features enabled.
60 60
diff --git a/Documentation/ja_JP/SubmitChecklist b/Documentation/ja_JP/SubmitChecklist
index 6c42e071d723..2df4576f1173 100644
--- a/Documentation/ja_JP/SubmitChecklist
+++ b/Documentation/ja_JP/SubmitChecklist
@@ -75,7 +75,7 @@ Linux カーネルパッチ投稿者向けチェックリスト
75 ビルドした上、動作確認を行ってください。 75 ビルドした上、動作確認を行ってください。
76 76
7714: もしパッチがディスクのI/O性能などに影響を与えるようであれば、 7714: もしパッチがディスクのI/O性能などに影響を与えるようであれば、
78 'CONFIG_LBD'オプションを有効にした場合と無効にした場合の両方で 78 'CONFIG_LBDAF'オプションを有効にした場合と無効にした場合の両方で
79 テストを実施してみてください。 79 テストを実施してみてください。
80 80
8115: lockdepの機能を全て有効にした上で、全てのコードパスを評価してください。 8115: lockdepの機能を全て有効にした上で、全てのコードパスを評価してください。
diff --git a/block/Kconfig b/block/Kconfig
index 2c39527aa7db..95a86adc33a1 100644
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -23,8 +23,8 @@ menuconfig BLOCK
23 23
24if BLOCK 24if BLOCK
25 25
26config LBD 26config LBDAF
27 bool "Support for large block devices and files" 27 bool "Support for large (2TB+) block devices and files"
28 depends on !64BIT 28 depends on !64BIT
29 default y 29 default y
30 help 30 help
diff --git a/block/blk-settings.c b/block/blk-settings.c
index 7541ea4bf9fe..bd582a7f5310 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -97,7 +97,7 @@ EXPORT_SYMBOL_GPL(blk_queue_lld_busy);
97 97
98/** 98/**
99 * blk_set_default_limits - reset limits to default values 99 * blk_set_default_limits - reset limits to default values
100 * @limits: the queue_limits structure to reset 100 * @lim: the queue_limits structure to reset
101 * 101 *
102 * Description: 102 * Description:
103 * Returns a queue_limit struct to its default state. Can be used by 103 * 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)
112 lim->max_segment_size = MAX_SEGMENT_SIZE; 112 lim->max_segment_size = MAX_SEGMENT_SIZE;
113 lim->max_sectors = lim->max_hw_sectors = SAFE_MAX_SECTORS; 113 lim->max_sectors = lim->max_hw_sectors = SAFE_MAX_SECTORS;
114 lim->logical_block_size = lim->physical_block_size = lim->io_min = 512; 114 lim->logical_block_size = lim->physical_block_size = lim->io_min = 512;
115 lim->bounce_pfn = BLK_BOUNCE_ANY; 115 lim->bounce_pfn = (unsigned long)(BLK_BOUNCE_ANY >> PAGE_SHIFT);
116 lim->alignment_offset = 0; 116 lim->alignment_offset = 0;
117 lim->io_opt = 0; 117 lim->io_opt = 0;
118 lim->misaligned = 0; 118 lim->misaligned = 0;
diff --git a/drivers/block/hd.c b/drivers/block/hd.c
index f65b3f369eb0..f9d01608cbe2 100644
--- a/drivers/block/hd.c
+++ b/drivers/block/hd.c
@@ -100,8 +100,6 @@ static DEFINE_SPINLOCK(hd_lock);
100static struct request_queue *hd_queue; 100static struct request_queue *hd_queue;
101static struct request *hd_req; 101static struct request *hd_req;
102 102
103#define MAJOR_NR HD_MAJOR
104
105#define TIMEOUT_VALUE (6*HZ) 103#define TIMEOUT_VALUE (6*HZ)
106#define HD_DELAY 0 104#define HD_DELAY 0
107 105
@@ -712,12 +710,12 @@ static int __init hd_init(void)
712{ 710{
713 int drive; 711 int drive;
714 712
715 if (register_blkdev(MAJOR_NR, "hd")) 713 if (register_blkdev(HD_MAJOR, "hd"))
716 return -1; 714 return -1;
717 715
718 hd_queue = blk_init_queue(do_hd_request, &hd_lock); 716 hd_queue = blk_init_queue(do_hd_request, &hd_lock);
719 if (!hd_queue) { 717 if (!hd_queue) {
720 unregister_blkdev(MAJOR_NR, "hd"); 718 unregister_blkdev(HD_MAJOR, "hd");
721 return -ENOMEM; 719 return -ENOMEM;
722 } 720 }
723 721
@@ -751,7 +749,7 @@ static int __init hd_init(void)
751 struct hd_i_struct *p = &hd_info[drive]; 749 struct hd_i_struct *p = &hd_info[drive];
752 if (!disk) 750 if (!disk)
753 goto Enomem; 751 goto Enomem;
754 disk->major = MAJOR_NR; 752 disk->major = HD_MAJOR;
755 disk->first_minor = drive << 6; 753 disk->first_minor = drive << 6;
756 disk->fops = &hd_fops; 754 disk->fops = &hd_fops;
757 sprintf(disk->disk_name, "hd%c", 'a'+drive); 755 sprintf(disk->disk_name, "hd%c", 'a'+drive);
@@ -795,7 +793,7 @@ out1:
795 NR_HD = 0; 793 NR_HD = 0;
796out: 794out:
797 del_timer(&device_timer); 795 del_timer(&device_timer);
798 unregister_blkdev(MAJOR_NR, "hd"); 796 unregister_blkdev(HD_MAJOR, "hd");
799 blk_cleanup_queue(hd_queue); 797 blk_cleanup_queue(hd_queue);
800 return -1; 798 return -1;
801Enomem: 799Enomem:
diff --git a/drivers/md/dm-exception-store.h b/drivers/md/dm-exception-store.h
index 0a2e6e7f67b3..c92701dc5001 100644
--- a/drivers/md/dm-exception-store.h
+++ b/drivers/md/dm-exception-store.h
@@ -111,7 +111,7 @@ struct dm_exception_store {
111/* 111/*
112 * Funtions to manipulate consecutive chunks 112 * Funtions to manipulate consecutive chunks
113 */ 113 */
114# if defined(CONFIG_LBD) || (BITS_PER_LONG == 64) 114# if defined(CONFIG_LBDAF) || (BITS_PER_LONG == 64)
115# define DM_CHUNK_CONSECUTIVE_BITS 8 115# define DM_CHUNK_CONSECUTIVE_BITS 8
116# define DM_CHUNK_NUMBER_BITS 56 116# define DM_CHUNK_NUMBER_BITS 56
117 117
diff --git a/fs/ext3/resize.c b/fs/ext3/resize.c
index 8a0b26340b54..8359e7b3dc89 100644
--- a/fs/ext3/resize.c
+++ b/fs/ext3/resize.c
@@ -990,7 +990,7 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es,
990 sb->s_id, n_blocks_count); 990 sb->s_id, n_blocks_count);
991 if (sizeof(sector_t) < 8) 991 if (sizeof(sector_t) < 8)
992 ext3_warning(sb, __func__, 992 ext3_warning(sb, __func__,
993 "CONFIG_LBD not enabled\n"); 993 "CONFIG_LBDAF not enabled\n");
994 return -EINVAL; 994 return -EINVAL;
995 } 995 }
996 996
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 26aa64dee6aa..601e881e6105 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -1812,7 +1812,7 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
1812 printk(KERN_ERR "EXT3-fs: filesystem on %s:" 1812 printk(KERN_ERR "EXT3-fs: filesystem on %s:"
1813 " too large to mount safely\n", sb->s_id); 1813 " too large to mount safely\n", sb->s_id);
1814 if (sizeof(sector_t) < 8) 1814 if (sizeof(sector_t) < 8)
1815 printk(KERN_WARNING "EXT3-fs: CONFIG_LBD not " 1815 printk(KERN_WARNING "EXT3-fs: CONFIG_LBDAF not "
1816 "enabled\n"); 1816 "enabled\n");
1817 goto failed_mount; 1817 goto failed_mount;
1818 } 1818 }
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
index 27eb289eea37..68b0351fc647 100644
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -1002,7 +1002,7 @@ int ext4_group_extend(struct super_block *sb, struct ext4_super_block *es,
1002 " too large to resize to %llu blocks safely\n", 1002 " too large to resize to %llu blocks safely\n",
1003 sb->s_id, n_blocks_count); 1003 sb->s_id, n_blocks_count);
1004 if (sizeof(sector_t) < 8) 1004 if (sizeof(sector_t) < 8)
1005 ext4_warning(sb, __func__, "CONFIG_LBD not enabled"); 1005 ext4_warning(sb, __func__, "CONFIG_LBDAF not enabled");
1006 return -EINVAL; 1006 return -EINVAL;
1007 } 1007 }
1008 1008
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 23013d303f81..8bb9e2d3e4b8 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1959,7 +1959,7 @@ static loff_t ext4_max_size(int blkbits, int has_huge_files)
1959 /* small i_blocks in vfs inode? */ 1959 /* small i_blocks in vfs inode? */
1960 if (!has_huge_files || sizeof(blkcnt_t) < sizeof(u64)) { 1960 if (!has_huge_files || sizeof(blkcnt_t) < sizeof(u64)) {
1961 /* 1961 /*
1962 * CONFIG_LBD is not enabled implies the inode 1962 * CONFIG_LBDAF is not enabled implies the inode
1963 * i_block represent total blocks in 512 bytes 1963 * i_block represent total blocks in 512 bytes
1964 * 32 == size of vfs inode i_blocks * 8 1964 * 32 == size of vfs inode i_blocks * 8
1965 */ 1965 */
@@ -2002,7 +2002,7 @@ static loff_t ext4_max_bitmap_size(int bits, int has_huge_files)
2002 2002
2003 if (!has_huge_files || sizeof(blkcnt_t) < sizeof(u64)) { 2003 if (!has_huge_files || sizeof(blkcnt_t) < sizeof(u64)) {
2004 /* 2004 /*
2005 * !has_huge_files or CONFIG_LBD not enabled implies that 2005 * !has_huge_files or CONFIG_LBDAF not enabled implies that
2006 * the inode i_block field represents total file blocks in 2006 * the inode i_block field represents total file blocks in
2007 * 2^32 512-byte sectors == size of vfs inode i_blocks * 8 2007 * 2^32 512-byte sectors == size of vfs inode i_blocks * 8
2008 */ 2008 */
@@ -2440,13 +2440,13 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
2440 if (has_huge_files) { 2440 if (has_huge_files) {
2441 /* 2441 /*
2442 * Large file size enabled file system can only be 2442 * Large file size enabled file system can only be
2443 * mount if kernel is build with CONFIG_LBD 2443 * mount if kernel is build with CONFIG_LBDAF
2444 */ 2444 */
2445 if (sizeof(root->i_blocks) < sizeof(u64) && 2445 if (sizeof(root->i_blocks) < sizeof(u64) &&
2446 !(sb->s_flags & MS_RDONLY)) { 2446 !(sb->s_flags & MS_RDONLY)) {
2447 ext4_msg(sb, KERN_ERR, "Filesystem with huge " 2447 ext4_msg(sb, KERN_ERR, "Filesystem with huge "
2448 "files cannot be mounted read-write " 2448 "files cannot be mounted read-write "
2449 "without CONFIG_LBD"); 2449 "without CONFIG_LBDAF");
2450 goto failed_mount; 2450 goto failed_mount;
2451 } 2451 }
2452 } 2452 }
@@ -2570,7 +2570,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
2570 ext4_msg(sb, KERN_ERR, "filesystem" 2570 ext4_msg(sb, KERN_ERR, "filesystem"
2571 " too large to mount safely"); 2571 " too large to mount safely");
2572 if (sizeof(sector_t) < 8) 2572 if (sizeof(sector_t) < 8)
2573 ext4_msg(sb, KERN_WARNING, "CONFIG_LBD not enabled"); 2573 ext4_msg(sb, KERN_WARNING, "CONFIG_LBDAF not enabled");
2574 goto failed_mount; 2574 goto failed_mount;
2575 } 2575 }
2576 2576
diff --git a/fs/gfs2/Kconfig b/fs/gfs2/Kconfig
index cad957cdb1e5..5971359d2090 100644
--- a/fs/gfs2/Kconfig
+++ b/fs/gfs2/Kconfig
@@ -1,6 +1,6 @@
1config GFS2_FS 1config GFS2_FS
2 tristate "GFS2 file system support" 2 tristate "GFS2 file system support"
3 depends on EXPERIMENTAL && (64BIT || LBD) 3 depends on EXPERIMENTAL && (64BIT || LBDAF)
4 select DLM if GFS2_FS_LOCKING_DLM 4 select DLM if GFS2_FS_LOCKING_DLM
5 select CONFIGFS_FS if GFS2_FS_LOCKING_DLM 5 select CONFIGFS_FS if GFS2_FS_LOCKING_DLM
6 select SYSFS if GFS2_FS_LOCKING_DLM 6 select SYSFS if GFS2_FS_LOCKING_DLM
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index d33767f17ba3..0d3ed7407a04 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -552,7 +552,7 @@ static unsigned long long ocfs2_max_file_offset(unsigned int bbits,
552 */ 552 */
553 553
554#if BITS_PER_LONG == 32 554#if BITS_PER_LONG == 32
555# if defined(CONFIG_LBD) 555# if defined(CONFIG_LBDAF)
556 BUILD_BUG_ON(sizeof(sector_t) != 8); 556 BUILD_BUG_ON(sizeof(sector_t) != 8);
557 /* 557 /*
558 * We might be limited by page cache size. 558 * We might be limited by page cache size.
diff --git a/fs/xfs/linux-2.6/xfs_linux.h b/fs/xfs/linux-2.6/xfs_linux.h
index f65a53f8752f..6127e24062d0 100644
--- a/fs/xfs/linux-2.6/xfs_linux.h
+++ b/fs/xfs/linux-2.6/xfs_linux.h
@@ -24,7 +24,7 @@
24 * XFS_BIG_BLKNOS needs block layer disk addresses to be 64 bits. 24 * XFS_BIG_BLKNOS needs block layer disk addresses to be 64 bits.
25 * XFS_BIG_INUMS requires XFS_BIG_BLKNOS to be set. 25 * XFS_BIG_INUMS requires XFS_BIG_BLKNOS to be set.
26 */ 26 */
27#if defined(CONFIG_LBD) || (BITS_PER_LONG == 64) 27#if defined(CONFIG_LBDAF) || (BITS_PER_LONG == 64)
28# define XFS_BIG_BLKNOS 1 28# define XFS_BIG_BLKNOS 1
29# define XFS_BIG_INUMS 1 29# define XFS_BIG_INUMS 1
30#else 30#else
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c
index 2e09efbca8db..a220d36f789b 100644
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@ -616,7 +616,7 @@ xfs_max_file_offset(
616 */ 616 */
617 617
618#if BITS_PER_LONG == 32 618#if BITS_PER_LONG == 32
619# if defined(CONFIG_LBD) 619# if defined(CONFIG_LBDAF)
620 ASSERT(sizeof(sector_t) == 8); 620 ASSERT(sizeof(sector_t) == 8);
621 pagefactor = PAGE_CACHE_SIZE; 621 pagefactor = PAGE_CACHE_SIZE;
622 bitshift = BITS_PER_LONG; 622 bitshift = BITS_PER_LONG;
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index c5a71c38a95f..fac104e7186a 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -58,7 +58,7 @@ extern const char linux_proc_banner[];
58#define _RET_IP_ (unsigned long)__builtin_return_address(0) 58#define _RET_IP_ (unsigned long)__builtin_return_address(0)
59#define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; }) 59#define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; })
60 60
61#ifdef CONFIG_LBD 61#ifdef CONFIG_LBDAF
62# include <asm/div64.h> 62# include <asm/div64.h>
63# define sector_div(a, b) do_div(a, b) 63# define sector_div(a, b) do_div(a, b)
64#else 64#else
diff --git a/include/linux/types.h b/include/linux/types.h
index 5abe354020f9..c42724f8c802 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -131,7 +131,7 @@ typedef __s64 int64_t;
131 * 131 *
132 * blkcnt_t is the type of the inode's block count. 132 * blkcnt_t is the type of the inode's block count.
133 */ 133 */
134#ifdef CONFIG_LBD 134#ifdef CONFIG_LBDAF
135typedef u64 sector_t; 135typedef u64 sector_t;
136typedef u64 blkcnt_t; 136typedef u64 blkcnt_t;
137#else 137#else