[Ocfs2-commits] mfasheh commits r2726 - branches/ocfs2-1.0/fs/ocfs2
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Wed Dec 7 20:17:22 CST 2005
Author: mfasheh
Signed-off-by: jlbec
Date: 2005-12-07 20:17:21 -0600 (Wed, 07 Dec 2005)
New Revision: 2726
Modified:
branches/ocfs2-1.0/fs/ocfs2/file.c
Log:
* Merge svn 2725 from ocfs2_1.2:
-Rework some of the tracing in file.c
Signed-off-by: jlbec
Modified: branches/ocfs2-1.0/fs/ocfs2/file.c
===================================================================
--- branches/ocfs2-1.0/fs/ocfs2/file.c 2005-12-08 02:15:58 UTC (rev 2725)
+++ branches/ocfs2-1.0/fs/ocfs2/file.c 2005-12-08 02:17:21 UTC (rev 2726)
@@ -742,7 +742,8 @@
ocfs2_alloc_context *meta_ac = NULL;
enum ocfs2_alloc_restarted why;
- mlog_entry("(new_i_size=%"MLFu64")\n", new_i_size);
+ mlog_entry("(Inode %"MLFu64" new_i_size=%"MLFu64")\n",
+ OCFS2_I(inode)->ip_blkno, new_i_size);
*bytes_extended = 0;
@@ -767,8 +768,16 @@
fe = (ocfs2_dinode *) bh->b_data;
OCFS2_BUG_ON_INVALID_DINODE(fe);
- BUG_ON(i_size_read(inode) != (fe->i_size - *bytes_extended));
- BUG_ON(new_i_size < i_size_read(inode));
+ mlog_bug_on_msg(i_size_read(inode) != (fe->i_size - *bytes_extended),
+ "Inode %"MLFu64" i_size = %lld, dinode i_size "
+ "= %"MLFu64", bytes_extended = %"MLFu64", new_i_size "
+ "= %"MLFu64"\n", OCFS2_I(inode)->ip_blkno,
+ i_size_read(inode), fe->i_size, *bytes_extended,
+ new_i_size);
+ mlog_bug_on_msg(new_i_size < i_size_read(inode),
+ "Inode %"MLFu64", i_size = %lld, new sz = %"MLFu64"\n",
+ OCFS2_I(inode)->ip_blkno, i_size_read(inode),
+ new_i_size);
if (i_size_read(inode) == new_i_size)
goto leave;
@@ -866,7 +875,8 @@
ocfs2_clusters_to_bytes(osb->sb, fe->i_clusters))) {
if (why == RESTART_META) {
- mlog(0, "restarting function.\n");
+ mlog(0, "Inode %"MLFu64" restarting function.\n",
+ OCFS2_I(inode)->ip_blkno);
restart_func = 1;
} else {
BUG_ON(why != RESTART_TRANS);
@@ -891,7 +901,8 @@
ocfs2_clusters_for_bytes(osb->sb,
new_i_size)
- fe->i_clusters;
- mlog(0, "restarting transaction.\n");
+ mlog(0, "Inode %"MLFu64" restarting transaction.\n",
+ OCFS2_I(inode)->ip_blkno);
/* TODO: This can be more intelligent. */
credits = ocfs2_calc_extend_credits(osb->sb,
fe,
@@ -975,8 +986,9 @@
struct buffer_head *bh = NULL;
ocfs2_journal_handle *handle = NULL;
- mlog_entry("(0x%p, '%.*s')\n", dentry,
- dentry->d_name.len, dentry->d_name.name);
+ mlog_entry("(0x%p, '%.*s', inode %"MLFu64")\n", dentry,
+ dentry->d_name.len, dentry->d_name.name,
+ OCFS2_I(inode)->ip_blkno);
if (attr->ia_valid & ATTR_MODE)
mlog(0, "mode change: %d\n", attr->ia_mode);
More information about the Ocfs2-commits
mailing list