diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-06-19 02:08:50 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2009-06-19 02:08:50 -0400 |
commit | 90c699a9ee4be165966d40f1837909ccb8890a68 (patch) | |
tree | ff136ce7b73c7d7bbf5eb4241d01cb3b930d3566 /fs/ext4 | |
parent | 3a02c8e8142f7f133d4c6e72bc3e1d830e6b8b9e (diff) |
block: rename CONFIG_LBD to CONFIG_LBDAF
Follow-up to "block: enable by default support for large devices
and files on 32-bit archs".
Rename CONFIG_LBD to CONFIG_LBDAF to:
- allow update of existing [def]configs for "default y" change
- reflect that it is used also for large files support nowadays
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'fs/ext4')
-rw-r--r-- | fs/ext4/resize.c | 2 | ||||
-rw-r--r-- | fs/ext4/super.c | 10 |
2 files changed, 6 insertions, 6 deletions
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 012c4251397e..6e0c2d77c87e 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -1957,7 +1957,7 @@ static loff_t ext4_max_size(int blkbits, int has_huge_files) | |||
1957 | /* small i_blocks in vfs inode? */ | 1957 | /* small i_blocks in vfs inode? */ |
1958 | if (!has_huge_files || sizeof(blkcnt_t) < sizeof(u64)) { | 1958 | if (!has_huge_files || sizeof(blkcnt_t) < sizeof(u64)) { |
1959 | /* | 1959 | /* |
1960 | * CONFIG_LBD is not enabled implies the inode | 1960 | * CONFIG_LBDAF is not enabled implies the inode |
1961 | * i_block represent total blocks in 512 bytes | 1961 | * i_block represent total blocks in 512 bytes |
1962 | * 32 == size of vfs inode i_blocks * 8 | 1962 | * 32 == size of vfs inode i_blocks * 8 |
1963 | */ | 1963 | */ |
@@ -2000,7 +2000,7 @@ static loff_t ext4_max_bitmap_size(int bits, int has_huge_files) | |||
2000 | 2000 | ||
2001 | if (!has_huge_files || sizeof(blkcnt_t) < sizeof(u64)) { | 2001 | if (!has_huge_files || sizeof(blkcnt_t) < sizeof(u64)) { |
2002 | /* | 2002 | /* |
2003 | * !has_huge_files or CONFIG_LBD not enabled implies that | 2003 | * !has_huge_files or CONFIG_LBDAF not enabled implies that |
2004 | * the inode i_block field represents total file blocks in | 2004 | * the inode i_block field represents total file blocks in |
2005 | * 2^32 512-byte sectors == size of vfs inode i_blocks * 8 | 2005 | * 2^32 512-byte sectors == size of vfs inode i_blocks * 8 |
2006 | */ | 2006 | */ |
@@ -2436,13 +2436,13 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) | |||
2436 | if (has_huge_files) { | 2436 | if (has_huge_files) { |
2437 | /* | 2437 | /* |
2438 | * Large file size enabled file system can only be | 2438 | * Large file size enabled file system can only be |
2439 | * mount if kernel is build with CONFIG_LBD | 2439 | * mount if kernel is build with CONFIG_LBDAF |
2440 | */ | 2440 | */ |
2441 | if (sizeof(root->i_blocks) < sizeof(u64) && | 2441 | if (sizeof(root->i_blocks) < sizeof(u64) && |
2442 | !(sb->s_flags & MS_RDONLY)) { | 2442 | !(sb->s_flags & MS_RDONLY)) { |
2443 | ext4_msg(sb, KERN_ERR, "Filesystem with huge " | 2443 | ext4_msg(sb, KERN_ERR, "Filesystem with huge " |
2444 | "files cannot be mounted read-write " | 2444 | "files cannot be mounted read-write " |
2445 | "without CONFIG_LBD"); | 2445 | "without CONFIG_LBDAF"); |
2446 | goto failed_mount; | 2446 | goto failed_mount; |
2447 | } | 2447 | } |
2448 | } | 2448 | } |
@@ -2566,7 +2566,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) | |||
2566 | ext4_msg(sb, KERN_ERR, "filesystem" | 2566 | ext4_msg(sb, KERN_ERR, "filesystem" |
2567 | " too large to mount safely"); | 2567 | " too large to mount safely"); |
2568 | if (sizeof(sector_t) < 8) | 2568 | if (sizeof(sector_t) < 8) |
2569 | ext4_msg(sb, KERN_WARNING, "CONFIG_LBD not enabled"); | 2569 | ext4_msg(sb, KERN_WARNING, "CONFIG_LBDAF not enabled"); |
2570 | goto failed_mount; | 2570 | goto failed_mount; |
2571 | } | 2571 | } |
2572 | 2572 | ||