diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-19 17:43:04 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-19 17:43:04 -0700 |
commit | 31583d6acf940d2951bc8716557b06d9de5a0c4b (patch) | |
tree | 607aef385b0998f0cb7ff63b05407afed5182840 /fs/ext4/resize.c | |
parent | ee37ba7a4212c7420f12e6a2ad8a3966649ede7a (diff) | |
parent | f740f5ca056f0a4eff3abdf272a8a4ba3965d57d (diff) | |
download | linux-31583d6acf940d2951bc8716557b06d9de5a0c4b.tar.bz2 |
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
Diffstat (limited to 'fs/ext4/resize.c')
-rw-r--r-- | fs/ext4/resize.c | 2 |
1 files changed, 1 insertions, 1 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, " too large to resize to %llu blocks safely\n", sb->s_id, n_blocks_count); if (sizeof(sector_t) < 8) - ext4_warning(sb, __func__, "CONFIG_LBD not enabled"); + ext4_warning(sb, __func__, "CONFIG_LBDAF not enabled"); return -EINVAL; } |