summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2013-02-14 15:51:58 -0500
committerTheodore Ts'o <tytso@mit.edu>2013-02-14 15:51:58 -0500
commit01a523eb51cb505a4bc1eaffeeccd2527d6ab619 (patch)
tree0e7bacf5b07dbf1e133c2f2f8d925a55e24d4146 /fs
parent8de5c325b4ee7d5b23b95edd28b81c9a2a9f427f (diff)
downloadlinux-stable-01a523eb51cb505a4bc1eaffeeccd2527d6ab619.tar.gz
linux-stable-01a523eb51cb505a4bc1eaffeeccd2527d6ab619.tar.bz2
linux-stable-01a523eb51cb505a4bc1eaffeeccd2527d6ab619.zip
ext4: add debugging context for warning in ext4_da_update_reserve_space()
Print some additional debugging context to hopefully help to debug a warning which is getting triggered by xfstests #74. Also remove extraneous newlines from when printk's were converted to ext4_warning() and ext4_msg(). Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext4/inode.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index b85d5dae726b..c4e9177f60c6 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -352,10 +352,12 @@ void ext4_da_update_reserve_space(struct inode *inode,
}
if (unlikely(ei->i_allocated_meta_blocks > ei->i_reserved_meta_blocks)) {
- ext4_warning(inode->i_sb, "%s: ino %lu, allocated %d "
- "with only %d reserved metadata blocks\n", __func__,
- inode->i_ino, ei->i_allocated_meta_blocks,
- ei->i_reserved_meta_blocks);
+ ext4_warning(inode->i_sb, "ino %lu, allocated %d "
+ "with only %d reserved metadata blocks "
+ "(releasing %d blocks with reserved %d data blocks)",
+ inode->i_ino, ei->i_allocated_meta_blocks,
+ ei->i_reserved_meta_blocks, used,
+ ei->i_reserved_data_blocks);
WARN_ON(1);
ei->i_allocated_meta_blocks = ei->i_reserved_meta_blocks;
}
@@ -1609,7 +1611,7 @@ static void mpage_da_map_and_submit(struct mpage_da_data *mpd)
(unsigned long long) next,
mpd->b_size >> mpd->inode->i_blkbits, err);
ext4_msg(sb, KERN_CRIT,
- "This should not happen!! Data will be lost\n");
+ "This should not happen!! Data will be lost");
if (err == -ENOSPC)
ext4_print_free_blocks(mpd->inode);
}