diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-03 03:15:35 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-03 03:15:35 -0500 |
| commit | b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15 (patch) | |
| tree | 99e5b423473097756353d038f922b2623f3edd2a /fs/ext4/extents.c | |
| parent | 1bded710a574f20d41bc9e7fb531301db282d623 (diff) | |
| parent | fb53fde9762432d091dac209bdf4f3f850117c55 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/Kconfig
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 54bf0623a9ae..e2eab196875f 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c | |||
| @@ -3048,7 +3048,7 @@ retry: | |||
| 3048 | WARN_ON(ret <= 0); | 3048 | WARN_ON(ret <= 0); |
| 3049 | printk(KERN_ERR "%s: ext4_ext_get_blocks " | 3049 | printk(KERN_ERR "%s: ext4_ext_get_blocks " |
| 3050 | "returned error inode#%lu, block=%u, " | 3050 | "returned error inode#%lu, block=%u, " |
| 3051 | "max_blocks=%lu", __func__, | 3051 | "max_blocks=%u", __func__, |
| 3052 | inode->i_ino, block, max_blocks); | 3052 | inode->i_ino, block, max_blocks); |
| 3053 | #endif | 3053 | #endif |
| 3054 | ext4_mark_inode_dirty(handle, inode); | 3054 | ext4_mark_inode_dirty(handle, inode); |