diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-30 08:54:29 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-30 08:54:29 -0800 |
commit | c01a25e7cf6dcb0fa69c155706d5dd1e76e53796 (patch) | |
tree | 3db1252892b9ec594b813b5996b2041df8e47dd3 /fs/ext4/extents.c | |
parent | ae704e9f92f87b12c5938b07245792857c7c9c14 (diff) | |
parent | b9ec63f78b425c0e16cc95605b5d4ff2dc228b97 (diff) | |
download | linux-3.10-c01a25e7cf6dcb0fa69c155706d5dd1e76e53796.tar.gz linux-3.10-c01a25e7cf6dcb0fa69c155706d5dd1e76e53796.tar.bz2 linux-3.10-c01a25e7cf6dcb0fa69c155706d5dd1e76e53796.zip |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
ext4: Remove bogus BUG() check in ext4_bmap()
ext4: Fix building with EXT4FS_DEBUG
ext4: Initialize the new group descriptor when resizing the filesystem
ext4: Fix ext4_free_blocks() w/o a journal when files have indirect blocks
jbd2: On a __journal_expect() assertion failure printk "JBD2", not "EXT3-fs"
ext3: Add sanity check to make_indexed_dir
ext4: Add sanity check to make_indexed_dir
ext4: only use i_size_high for regular files
ext4: fix wrong use of do_div
Diffstat (limited to 'fs/ext4/extents.c')
-rw-r--r-- | fs/ext4/extents.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 54bf0623a9a..e2eab196875 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -3048,7 +3048,7 @@ retry: WARN_ON(ret <= 0); printk(KERN_ERR "%s: ext4_ext_get_blocks " "returned error inode#%lu, block=%u, " - "max_blocks=%lu", __func__, + "max_blocks=%u", __func__, inode->i_ino, block, max_blocks); #endif ext4_mark_inode_dirty(handle, inode); |