[Ocfs2-commits] mfasheh commits r1242 - trunk/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-07-06 16:50:49 -0500 (Tue, 06 Jul 2004)
New Revision: 1242

Modified:
   trunk/src/file.c
   trunk/src/namei.c
Log:
* Commit a patch from <hch at lst.de>:
looks like no one tests with CONFIG_LBD..



Modified: trunk/src/file.c
===================================================================
--- trunk/src/file.c	2004-07-06 20:33:10 UTC (rev 1241)
+++ trunk/src/file.c	2004-07-06 21:50:49 UTC (rev 1242)
@@ -1260,7 +1260,8 @@
 					LOG_ERROR_STATUS(status=-EIO);
 					goto leave;
 				}
-				LOG_TRACE_ARGS("setting block %lu as new!\n", block);
+				LOG_TRACE_ARGS("setting block %llu as new!\n",
+					       (unsigned long long)block);
 				alloc_bh->b_state |= (1UL << BH_New);
 				brelse(alloc_bh);
 			}

Modified: trunk/src/namei.c
===================================================================
--- trunk/src/namei.c	2004-07-06 20:33:10 UTC (rev 1241)
+++ trunk/src/namei.c	2004-07-06 21:50:49 UTC (rev 1242)
@@ -254,8 +254,10 @@
 	fe = (ocfs2_dinode *)new_fe_bh->b_data;
 
 	if (ocfs_populate_inode(inode, fe, 1) < 0) {
-		LOG_ERROR_ARGS("populate inode failed! bh->b_blocknr=%lu, i_blkno=%llu, i_ino=%lu\n",
-			       new_fe_bh->b_blocknr, fe->i_blkno, inode->i_ino);
+		LOG_ERROR_ARGS("populate inode failed! bh->b_blocknr=%llu, "
+			       "i_blkno=%llu, i_ino=%lu\n",
+			       (unsigned long long)new_fe_bh->b_blocknr,
+			       fe->i_blkno, inode->i_ino);
 		BUG();
 	}
 
@@ -1567,8 +1569,10 @@
 	fe = (ocfs2_dinode *) new_fe_bh->b_data;
 	
 	if (ocfs_populate_inode (inode, fe, 1) < 0) {
-		LOG_ERROR_ARGS("populate inode failed! bh->b_blocknr=%lu, i_blkno=%llu, i_ino=%lu\n",
-			       new_fe_bh->b_blocknr, fe->i_blkno, inode->i_ino);
+		LOG_ERROR_ARGS("populate inode failed! bh->b_blocknr=%llu, "
+			       "i_blkno=%llu, i_ino=%lu\n",
+			       (unsigned long long)new_fe_bh->b_blocknr,
+			       fe->i_blkno, inode->i_ino);
 		BUG();
 	}