[Ocfs2-commits] manish commits r2175 - in trunk/fs/ocfs2: . cluster
dlm
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Mon Apr 25 22:23:12 CDT 2005
Author: manish
Signed-off-by: mfasheh
Date: 2005-04-25 22:23:11 -0500 (Mon, 25 Apr 2005)
New Revision: 2175
Modified:
trunk/fs/ocfs2/alloc.c
trunk/fs/ocfs2/aops.c
trunk/fs/ocfs2/buffer_head_io.c
trunk/fs/ocfs2/cluster/masklog.h
trunk/fs/ocfs2/dcache.c
trunk/fs/ocfs2/dir.c
trunk/fs/ocfs2/dlm/dlmast.c
trunk/fs/ocfs2/dlm/dlmconvert.c
trunk/fs/ocfs2/dlm/dlmdebug.c
trunk/fs/ocfs2/dlm/dlmrecovery.c
trunk/fs/ocfs2/dlm/dlmunlock.c
trunk/fs/ocfs2/dlmglue.c
trunk/fs/ocfs2/file.c
trunk/fs/ocfs2/inode.c
trunk/fs/ocfs2/journal.c
trunk/fs/ocfs2/localalloc.c
trunk/fs/ocfs2/mmap.c
trunk/fs/ocfs2/namei.c
trunk/fs/ocfs2/ocfs.h
trunk/fs/ocfs2/proc.c
trunk/fs/ocfs2/suballoc.c
trunk/fs/ocfs2/super.c
trunk/fs/ocfs2/vote.c
Log:
Define MLFu64 and friends, for portable format strings for sized 64-bit types.
This gets rid of the tons on warnings on ia64 and ppc64.
Signed-off-by: mfasheh
Modified: trunk/fs/ocfs2/alloc.c
===================================================================
--- trunk/fs/ocfs2/alloc.c 2005-04-26 01:58:50 UTC (rev 2174)
+++ trunk/fs/ocfs2/alloc.c 2005-04-26 03:23:11 UTC (rev 2175)
@@ -776,7 +776,8 @@
mlog_entry_void();
- mlog(0, "add %u clusters starting at block %llu to inode %llu\n",
+ mlog(0, "add %u clusters starting at block %"MLFu64" to "
+ "inode %"MLFu64"\n",
new_clusters, start_blk, OCFS_I(inode)->ip_blkno);
fe = (ocfs2_dinode *) fe_bh->b_data;
@@ -934,7 +935,7 @@
*new_last_eb = bh;
get_bh(*new_last_eb);
- mlog(0, "returning block %llu\n", le64_to_cpu(eb->h_blkno));
+ mlog(0, "returning block %"MLFu64"\n", le64_to_cpu(eb->h_blkno));
bail:
if (bh)
brelse(bh);
@@ -1046,8 +1047,8 @@
}
/* if our tree depth > 0, update all the tree blocks below us. */
- while(depth) {
- mlog(0, "traveling tree (depth = %d, next_eb = %llu)\n",
+ while (depth) {
+ mlog(0, "traveling tree (depth = %d, next_eb = %"MLFu64")\n",
depth, next_eb);
status = ocfs_read_block(osb, next_eb, &eb_bh,
OCFS_BH_CACHED, inode);
@@ -1055,7 +1056,7 @@
mlog_errno(status);
goto bail;
}
- eb = (ocfs2_extent_block *) eb_bh->b_data;
+ eb = (ocfs2_extent_block *)eb_bh->b_data;
OCFS_ASSERT(IS_VALID_EXTENT_BLOCK(eb));
el = &(eb->h_list);
@@ -1071,8 +1072,8 @@
i = el->l_next_free_rec - 1;
- mlog(0, "extent block %llu, before: record %d: "
- "(%u, %u, %llu), next = %u\n",
+ mlog(0, "extent block %"MLFu64", before: record %d: "
+ "(%u, %u, %"MLFu64"), next = %u\n",
le64_to_cpu(eb->h_blkno), i,
el->l_recs[i].e_cpos, el->l_recs[i].e_clusters,
el->l_recs[i].e_blkno, el->l_next_free_rec);
@@ -1091,8 +1092,8 @@
OCFS_ASSERT(el->l_next_free_rec);
el->l_next_free_rec--;
}
- mlog(0, "extent block %llu, after: record %d: "
- "(%u, %u, %llu), next = %u\n",
+ mlog(0, "extent block %"MLFu64", after: record %d: "
+ "(%u, %u, %"MLFu64"), next = %u\n",
le64_to_cpu(eb->h_blkno), i,
el->l_recs[i].e_cpos, el->l_recs[i].e_clusters,
el->l_recs[i].e_blkno, el->l_next_free_rec);
@@ -1188,7 +1189,7 @@
last_eb = fe->i_last_eb_blk;
start:
mlog(0, "ocfs_commit_truncate: fe->i_clusters = %u, "
- "last_eb = %llu, fe->i_last_eb_blk = %llu, "
+ "last_eb = %"MLFu64", fe->i_last_eb_blk = %"MLFu64", "
"fe->id2.i_list.l_tree_depth = %u last_eb_bh = %p\n",
fe->i_clusters, last_eb, fe->i_last_eb_blk,
fe->id2.i_list.l_tree_depth, last_eb_bh);
@@ -1308,7 +1309,7 @@
fe = (ocfs2_dinode *) fe_bh->b_data;
mlog(0, "fe->i_clusters = %u, new_i_clusters = %u, fe->i_size ="
- "%llu\n", fe->i_clusters, new_i_clusters, fe->i_size);
+ "%"MLFu64"\n", fe->i_clusters, new_i_clusters, fe->i_size);
OCFS_ASSERT(fe->i_clusters > new_i_clusters);
Modified: trunk/fs/ocfs2/aops.c
===================================================================
--- trunk/fs/ocfs2/aops.c 2005-04-26 01:58:50 UTC (rev 2174)
+++ trunk/fs/ocfs2/aops.c 2005-04-26 03:23:11 UTC (rev 2175)
@@ -72,7 +72,7 @@
if (!IS_VALID_FILE_ENTRY(fe)) {
mlog(ML_ERROR, "Invalid fe at blkno %llu",
- OCFS_I(inode)->ip_blkno);
+ (unsigned long long)OCFS_I(inode)->ip_blkno);
goto bail;
}
@@ -165,9 +165,9 @@
NULL);
if (err) {
- mlog(ML_ERROR, "Error %d from get_blocks(0x%p, %llu, 1, %llu, "
- "NULL)\n", err, inode, (unsigned long long)iblock,
- p_blkno);
+ mlog(ML_ERROR, "Error %d from get_blocks(0x%p, %llu, 1, "
+ "%"MLFu64", NULL)\n",
+ err, inode, (unsigned long long)iblock, p_blkno);
goto bail;
}
@@ -177,7 +177,8 @@
if (bh_result->b_blocknr == 0) {
err = -EIO;
- mlog(ML_ERROR, "iblock = %llu p_blkno = %llu blkno=(%llu)\n",
+ mlog(ML_ERROR, "iblock = %llu p_blkno = %"MLFu64" "
+ "blkno=(%"MLFu64")\n",
(unsigned long long)iblock, p_blkno,
OCFS_I(inode)->ip_blkno);
}
@@ -187,9 +188,10 @@
if (!create)
goto bail;
if (vbo != OCFS_I(inode)->ip_mmu_private) {
- mlog(ML_ERROR, "Uh-oh, vbo = %lld, i_size = %llu, mmu = %llu, "
- "inode = %llu\n",
- vbo, i_size_read(inode),
+ mlog(ML_ERROR, "Uh-oh, vbo = %"MLFi64", i_size = %lld, "
+ "mmu = %lld, inode = %"MLFu64"\n",
+ vbo,
+ i_size_read(inode),
OCFS_I(inode)->ip_mmu_private,
OCFS_I(inode)->ip_blkno);
BUG();
Modified: trunk/fs/ocfs2/buffer_head_io.c
===================================================================
--- trunk/fs/ocfs2/buffer_head_io.c 2005-04-26 01:58:50 UTC (rev 2174)
+++ trunk/fs/ocfs2/buffer_head_io.c 2005-04-26 03:23:11 UTC (rev 2175)
@@ -156,8 +156,8 @@
int i, ignore_cache = 0;
struct buffer_head *bh;
- mlog_entry("(block=(%llu), nr=(%d), flags=%d, inode=%p)\n",
- block, nr, flags, inode);
+ mlog_entry("(block=(%"MLFu64"), nr=(%d), flags=%d, inode=%p)\n",
+ block, nr, flags, inode);
if (osb == NULL || osb->sb == NULL || bhs == NULL) {
status = -EINVAL;
@@ -270,7 +270,7 @@
if (inode)
up(&OCFS_I(inode)->ip_io_sem);
- mlog(ML_BH_IO, "block=(%llu), nr=(%d), cached=%s\n", block, nr,
+ mlog(ML_BH_IO, "block=(%"MLFu64"), nr=(%d), cached=%s\n", block, nr,
(!(flags & OCFS_BH_CACHED) || ignore_cache) ? "no" : "yes");
bail:
Modified: trunk/fs/ocfs2/cluster/masklog.h
===================================================================
--- trunk/fs/ocfs2/cluster/masklog.h 2005-04-26 01:58:50 UTC (rev 2174)
+++ trunk/fs/ocfs2/cluster/masklog.h 2005-04-26 03:23:11 UTC (rev 2175)
@@ -223,6 +223,16 @@
mlog(ML_EXIT, "EXIT\n"); \
} while (0)
+#if BITS_PER_LONG == 32
+#define MLFi64 "lld"
+#define MLFu64 "llu"
+#define MLFx64 "llx"
+#else
+#define MLFi64 "ld"
+#define MLFu64 "lu"
+#define MLFx64 "lx"
+#endif
+
#include <linux/proc_fs.h>
int mlog_init_proc(struct proc_dir_entry *parent);
void mlog_remove_proc(struct proc_dir_entry *parent);
Modified: trunk/fs/ocfs2/dcache.c
===================================================================
--- trunk/fs/ocfs2/dcache.c 2005-04-26 01:58:50 UTC (rev 2174)
+++ trunk/fs/ocfs2/dcache.c 2005-04-26 03:23:11 UTC (rev 2175)
@@ -66,7 +66,7 @@
/* did we or someone else delete this inode? */
if (INODE_DELETED(inode)) {
spin_unlock(&OCFS_I(inode)->ip_lock);
- mlog(0, "inode (%llu) deleted, returning false\n",
+ mlog(0, "inode (%"MLFu64") deleted, returning false\n",
OCFS_I(inode)->ip_blkno);
goto bail;
}
@@ -74,7 +74,7 @@
#warning "should we do this for all files?"
if (S_ISDIR(inode->i_mode) && (!inode->i_nlink)) {
- mlog(0, "dir inode (%llu) orphaned, returning false\n",
+ mlog(0, "dir inode (%"MLFu64") orphaned, returning false\n",
OCFS_I(inode)->ip_blkno);
goto bail;
}
Modified: trunk/fs/ocfs2/dir.c
===================================================================
--- trunk/fs/ocfs2/dir.c 2005-04-26 01:58:50 UTC (rev 2174)
+++ trunk/fs/ocfs2/dir.c 2005-04-26 03:23:11 UTC (rev 2175)
@@ -85,7 +85,7 @@
struct super_block * sb = inode->i_sb;
int have_disk_lock = 0;
- mlog_entry("dirino=%llu\n", OCFS_I(inode)->ip_blkno);
+ mlog_entry("dirino=%"MLFu64"\n", OCFS_I(inode)->ip_blkno);
stored = 0;
bh = NULL;
@@ -105,9 +105,10 @@
blk = (filp->f_pos) >> sb->s_blocksize_bits;
bh = ocfs_bread (inode, blk, &err, 0);
if (!bh) {
- mlog(ML_ERROR, "directory #%llu contains a hole at "
- "offset %lu\n", OCFS_I(inode)->ip_blkno,
- (unsigned long)filp->f_pos);
+ mlog(ML_ERROR, "directory #%"MLFu64" contains a hole "
+ "at offset %lld\n",
+ OCFS_I(inode)->ip_blkno,
+ filp->f_pos);
filp->f_pos += sb->s_blocksize - offset;
continue;
}
@@ -218,8 +219,9 @@
int status = -ENOENT;
int lock_acq = 0;
- mlog_entry ("(osb=%p, parent=%llu, name='%.*s', blkno=%p, inode=%p)\n",
- osb, OCFS_I(inode)->ip_blkno, namelen, name, blkno, inode);
+ mlog_entry ("(osb=%p, parent=%"MLFu64", name='%.*s', blkno=%p, "
+ "inode=%p)\n",
+ osb, OCFS_I(inode)->ip_blkno, namelen, name, blkno, inode);
if (take_lock) {
/* Get a lock on the directory... */
@@ -274,7 +276,8 @@
if ((i_size_read(inode) <
(OCFS2_DIR_REC_LEN(1) + OCFS2_DIR_REC_LEN(2))) ||
!(bh = ocfs_bread (inode, 0, &err, 0))) {
- mlog(ML_ERROR, "bad directory (dir #%llu) - no data block\n",
+ mlog(ML_ERROR, "bad directory (dir #%"MLFu64") - "
+ "no data block\n",
OCFS_I(inode)->ip_blkno);
return 1;
}
@@ -286,7 +289,8 @@
!le64_to_cpu(de1->inode) ||
strcmp (".", de->name) ||
strcmp ("..", de1->name)) {
- mlog(ML_ERROR, "bad directory (dir #%llu) - no `.' or `..'\n",
+ mlog(ML_ERROR, "bad directory (dir #%"MLFu64") - "
+ "no `.' or `..'\n",
OCFS_I(inode)->ip_blkno);
brelse (bh);
return 1;
@@ -299,8 +303,8 @@
bh = ocfs_bread(inode,
offset >> sb->s_blocksize_bits, &err, 0);
if (!bh) {
- mlog(ML_ERROR, "directory #%llu contains a "
- "hole at offset %lu\n",
+ mlog(ML_ERROR, "directory #%"MLFu64" contains "
+ "a hole at offset %lu\n",
OCFS_I(inode)->ip_blkno, offset);
offset += sb->s_blocksize;
continue;
@@ -390,8 +394,8 @@
mlog_entry_void();
dir_i_size = i_size_read(dir);
- mlog(0, "extending dir %llu (i_size = %llu)\n", OCFS_I(dir)->ip_blkno,
- dir_i_size);
+ mlog(0, "extending dir %"MLFu64" (i_size = %lld)\n",
+ OCFS_I(dir)->ip_blkno, dir_i_size);
handle = ocfs_alloc_handle(osb);
if (handle == NULL) {
@@ -512,7 +516,7 @@
mlog_entry_void();
- mlog(0, "getting ready to insert namelen %d into dir %llu\n",
+ mlog(0, "getting ready to insert namelen %d into dir %"MLFu64"\n",
namelen, OCFS_I(dir)->ip_blkno);
OCFS_ASSERT(S_ISDIR(dir->i_mode));
Modified: trunk/fs/ocfs2/dlm/dlmast.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmast.c 2005-04-26 01:58:50 UTC (rev 2174)
+++ trunk/fs/ocfs2/dlm/dlmast.c 2005-04-26 03:23:11 UTC (rev 2175)
@@ -249,7 +249,7 @@
if (past->type != DLM_AST &&
past->type != DLM_BAST) {
- mlog(ML_ERROR, "Unknown ast type! %d, cookie=%llu, "
+ mlog(ML_ERROR, "Unknown ast type! %d, cookie=%"MLFu64", "
"name=%.*s\n", past->type, cookie, locklen, name);
ret = DLM_IVLOCKID;
goto leave;
@@ -257,8 +257,8 @@
res = dlm_lookup_lockres(dlm, name, locklen);
if (!res) {
- mlog(ML_ERROR, "got %sast for unknown lockres! cookie=%llu, "
- "name=%.*s, namelen=%u\n",
+ mlog(ML_ERROR, "got %sast for unknown lockres! "
+ "cookie=%"MLFu64", name=%.*s, namelen=%u\n",
past->type == DLM_AST ? "" : "b",
cookie, locklen, name, locklen);
ret = DLM_IVLOCKID;
@@ -304,9 +304,9 @@
goto do_ast;
}
- mlog(ML_ERROR, "got %sast for unknown lock! cookie=%llu, name=%.*s, "
- "namelen=%u\n", past->type == DLM_AST ? "" : "b", cookie, locklen,
- name, locklen);
+ mlog(ML_ERROR, "got %sast for unknown lock! cookie=%"MLFu64", "
+ "name=%.*s, namelen=%u\n",
+ past->type == DLM_AST ? "" : "b", cookie, locklen, name, locklen);
ret = DLM_NORMAL;
unlock_out:
Modified: trunk/fs/ocfs2/dlm/dlmconvert.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmconvert.c 2005-04-26 01:58:50 UTC (rev 2174)
+++ trunk/fs/ocfs2/dlm/dlmconvert.c 2005-04-26 03:23:11 UTC (rev 2175)
@@ -471,7 +471,8 @@
leave:
if (!lock)
mlog(ML_ERROR, "did not find lock to convert on grant queue! "
- "cookie=%llu\n", cnv->cookie);
+ "cookie=%"MLFu64"\n",
+ cnv->cookie);
else
dlm_lock_put(lock);
Modified: trunk/fs/ocfs2/dlm/dlmdebug.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmdebug.c 2005-04-26 01:58:50 UTC (rev 2174)
+++ trunk/fs/ocfs2/dlm/dlmdebug.c 2005-04-26 03:23:11 UTC (rev 2175)
@@ -153,7 +153,7 @@
lock = list_entry(iter2, dlm_lock, list);
spin_lock(&lock->spinlock);
printk(" type=%d, conv=%d, node=%u, "
- "cookie=%llu\n", lock->ml.type,
+ "cookie=%"MLFu64"\n", lock->ml.type,
lock->ml.convert_type, lock->ml.node,
lock->ml.cookie);
spin_unlock(&lock->spinlock);
@@ -163,7 +163,7 @@
lock = list_entry(iter2, dlm_lock, list);
spin_lock(&lock->spinlock);
printk(" type=%d, conv=%d, node=%u, "
- "cookie=%llu\n", lock->ml.type,
+ "cookie=%"MLFu64"\n", lock->ml.type,
lock->ml.convert_type, lock->ml.node,
lock->ml.cookie);
spin_unlock(&lock->spinlock);
@@ -173,7 +173,7 @@
lock = list_entry(iter2, dlm_lock, list);
spin_lock(&lock->spinlock);
printk(" type=%d, conv=%d, node=%u, "
- "cookie=%llu\n", lock->ml.type,
+ "cookie=%"MLFu64"\n", lock->ml.type,
lock->ml.convert_type, lock->ml.node,
lock->ml.cookie);
spin_unlock(&lock->spinlock);
Modified: trunk/fs/ocfs2/dlm/dlmrecovery.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmrecovery.c 2005-04-26 01:58:50 UTC (rev 2174)
+++ trunk/fs/ocfs2/dlm/dlmrecovery.c 2005-04-26 03:23:11 UTC (rev 2175)
@@ -1362,7 +1362,8 @@
* destroyed locally last. it must be on the list */
if (!lock) {
mlog(ML_ERROR, "could not find local lock "
- "with cookie %llu!\n", ml->cookie);
+ "with cookie %"MLFu64"!\n",
+ ml->cookie);
BUG();
}
DLM_ASSERT(lock->ml.node == ml->node);
Modified: trunk/fs/ocfs2/dlm/dlmunlock.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmunlock.c 2005-04-26 01:58:50 UTC (rev 2174)
+++ trunk/fs/ocfs2/dlm/dlmunlock.c 2005-04-26 03:23:11 UTC (rev 2175)
@@ -191,7 +191,7 @@
if (actions & DLM_UNLOCK_FREE_LOCK) {
/* this should always be coupled with list removal */
DLM_ASSERT(actions & DLM_UNLOCK_REMOVE_LOCK);
- mlog(0, "lock %llu should be gone now! refs=%d\n",
+ mlog(0, "lock %"MLFu64" should be gone now! refs=%d\n",
lock->ml.cookie, atomic_read(&lock->lock_refs.refcount));
}
if (actions & DLM_UNLOCK_CALL_AST)
@@ -409,7 +409,8 @@
not_found:
if (!found)
- mlog(ML_ERROR, "failed to find lock to unlock! cookie=%llu\n",
+ mlog(ML_ERROR, "failed to find lock to unlock! "
+ "cookie=%"MLFu64"\n",
unlock->cookie);
else {
/* send the lksb->status back to the other node */
Modified: trunk/fs/ocfs2/dlmglue.c
===================================================================
--- trunk/fs/ocfs2/dlmglue.c 2005-04-26 01:58:50 UTC (rev 2174)
+++ trunk/fs/ocfs2/dlmglue.c 2005-04-26 03:23:11 UTC (rev 2175)
@@ -291,7 +291,7 @@
}
memset(name, 0, OCFS2_LOCK_ID_MAX_LEN);
- len = snprintf(name, OCFS2_LOCK_ID_MAX_LEN, "%c%s%016llx%08x",
+ len = snprintf(name, OCFS2_LOCK_ID_MAX_LEN, "%c%s%016"MLFx64"%08x",
ocfs2_lock_type_char[type], OCFS2_LOCK_ID_PAD, blkno,
generation);
@@ -587,7 +587,7 @@
inode = ocfs2_lock_res_inode(lockres);
osb = OCFS2_SB(inode->i_sb);
- mlog(0, "AST fired for inode %llu, l_action = %u, type = %s\n",
+ mlog(0, "AST fired for inode %"MLFu64", l_action = %u, type = %s\n",
OCFS_I(inode)->ip_blkno, lockres->l_action,
(lockres->l_type == OCFS_TYPE_META) ? "Meta" : "Data");
@@ -600,7 +600,8 @@
lksb = &(lockres->l_lksb);
if (lksb->status != DLM_NORMAL) {
mlog(ML_ERROR, "ocfs2_inode_ast_func: lksb status value of %u "
- "on inode %llu\n", lksb->status,
+ "on inode %"MLFu64"\n",
+ lksb->status,
OCFS_I(inode)->ip_blkno);
spin_unlock(&lockres->l_lock);
mlog_exit_void();
@@ -682,7 +683,7 @@
inode = ocfs2_lock_res_inode(lockres);
osb = OCFS2_SB(inode->i_sb);
- mlog(0, "BAST fired for inode %llu, blocking = %d, level = %d "
+ mlog(0, "BAST fired for inode %"MLFu64", blocking = %d, level = %d "
"type = %s\n", OCFS_I(inode)->ip_blkno, level,
lockres->l_level,
(lockres->l_type == OCFS_TYPE_META) ? "Meta" : "Data");
@@ -1125,7 +1126,8 @@
mlog_entry_void();
- mlog(0, "inode %llu, take %s DATA lock\n", OCFS_I(inode)->ip_blkno,
+ mlog(0, "inode %"MLFu64" take %s DATA lock\n",
+ OCFS_I(inode)->ip_blkno,
write ? "EXMODE" : "PRMODE");
lockres = &OCFS_I(inode)->ip_data_lockres;
@@ -1180,7 +1182,8 @@
mlog_entry_void();
- mlog(0, "inode %llu drop %s DATA lock\n", OCFS_I(inode)->ip_blkno,
+ mlog(0, "inode %"MLFu64" drop %s DATA lock\n",
+ OCFS_I(inode)->ip_blkno,
write ? "EXMODE" : "PRMODE");
ocfs2_cluster_unlock(OCFS2_SB(inode->i_sb), lockres, level);
@@ -1226,10 +1229,10 @@
be32_to_cpu(lvb->lvb.lvb_seq),
be32_to_cpu(lvb->lvb_trunc_clusters),
be32_to_cpu(lvb->lvb_iclusters));
- mlog(0, "uid %u, gid %u, isize %llu, mode 0x%x\n",
+ mlog(0, "uid %u, gid %u, isize %"MLFu64", mode 0x%x\n",
be32_to_cpu(lvb->lvb_iuid), be32_to_cpu(lvb->lvb_igid),
be64_to_cpu(lvb->lvb_isize), be16_to_cpu(lvb->lvb_imode));
- mlog(0, "nlink %u, atime %llx, ctime %llx, mtime %llx\n",
+ mlog(0, "nlink %u, atime %"MLFu64", ctime %"MLFx64", mtime %"MLFx64"\n",
be16_to_cpu(lvb->lvb_inlink), be64_to_cpu(lvb->lvb_iatime),
be64_to_cpu(lvb->lvb_ictime), be64_to_cpu(lvb->lvb_imtime));
@@ -1398,7 +1401,7 @@
ocfs_refresh_inode(inode, fe);
}
- mlog(0, "inode %llu, I can only trust %u clusters\n",
+ mlog(0, "inode %"MLFu64", I can only trust %u clusters\n",
OCFS_I(inode)->ip_blkno, trustable_clusters);
/* will do nothing for inode types that don't use the extent
@@ -1436,7 +1439,8 @@
mlog_entry_void();
- mlog(0, "inode %llu, take %s META lock\n", OCFS_I(inode)->ip_blkno,
+ mlog(0, "inode %"MLFu64", take %s META lock\n",
+ OCFS_I(inode)->ip_blkno,
ex ? "EXMODE" : "PRMODE");
status = 0;
@@ -1544,7 +1548,8 @@
mlog_entry_void();
- mlog(0, "inode %llu drop %s META lock\n", OCFS_I(inode)->ip_blkno,
+ mlog(0, "inode %"MLFu64" drop %s META lock\n",
+ OCFS_I(inode)->ip_blkno,
ex ? "EXMODE" : "PRMODE");
ocfs2_cluster_unlock(OCFS2_SB(inode->i_sb), lockres, level);
@@ -2127,7 +2132,7 @@
mapping = inode->i_mapping;
if (filemap_fdatawrite(mapping)) {
- mlog(ML_ERROR, "Could not sync inode %llu for downconvert!",
+ mlog(ML_ERROR, "Could not sync inode %"MLFu64" for downconvert!",
OCFS_I(inode)->ip_blkno);
}
sync_mapping_buffers(mapping);
@@ -2160,7 +2165,7 @@
inode = ocfs2_lock_res_inode(lockres);
osb = OCFS2_SB(inode->i_sb);
- mlog(0, "unblock inode %llu\n", OCFS_I(inode)->ip_blkno);
+ mlog(0, "unblock inode %"MLFu64"\n", OCFS_I(inode)->ip_blkno);
status = ocfs2_generic_unblock_lock(osb,
lockres,
@@ -2169,8 +2174,8 @@
if (status < 0)
mlog_errno(status);
- mlog(0, "inode %llu, requeue = %d\n", OCFS_I(inode)->ip_blkno,
- *requeue);
+ mlog(0, "inode %"MLFu64", requeue = %d\n",
+ OCFS_I(inode)->ip_blkno, *requeue);
/* because of inode ref counting, we never want to propagate
* up requeue requests for inode locks. Instead we do it
@@ -2196,14 +2201,14 @@
inode = ocfs2_lock_res_inode(lockres);
- mlog(0, "unblock inode %llu\n", OCFS_I(inode)->ip_blkno);
+ mlog(0, "unblock inode %"MLFu64"\n", OCFS_I(inode)->ip_blkno);
status = ocfs2_do_unblock_meta(inode, requeue);
if (status < 0)
mlog_errno(status);
- mlog(0, "inode %llu, requeue = %d\n", OCFS_I(inode)->ip_blkno,
- *requeue);
+ mlog(0, "inode %"MLFu64", requeue = %d\n",
+ OCFS_I(inode)->ip_blkno, *requeue);
/* if you're confused by this, see the comment in
* ocfs2_unblock_data */
@@ -2287,8 +2292,9 @@
{
mlog_entry_void();
if (!igrab(inode)) {
- mlog(ML_ERROR, "Inode %llu asked to be scheduled during "
- "clear_inode!\n", OCFS_I(inode)->ip_blkno);
+ mlog(ML_ERROR, "Inode %"MLFu64" asked to be scheduled during "
+ "clear_inode!\n",
+ OCFS_I(inode)->ip_blkno);
return;
}
Modified: trunk/fs/ocfs2/file.c
===================================================================
--- trunk/fs/ocfs2/file.c 2005-04-26 01:58:50 UTC (rev 2174)
+++ trunk/fs/ocfs2/file.c 2005-04-26 03:23:11 UTC (rev 2175)
@@ -484,8 +484,8 @@
ocfs_journal_handle *handle = NULL;
ocfs2_truncate_context *tc = NULL;
- mlog_entry("(inode = %llu, new_i_size = %llu\n",
- OCFS_I(inode)->ip_blkno, new_i_size);
+ mlog_entry("(inode = %"MLFu64", new_i_size = %"MLFu64"\n",
+ OCFS_I(inode)->ip_blkno, new_i_size);
truncate_inode_pages(inode->i_mapping, new_i_size);
@@ -501,14 +501,15 @@
OCFS_ASSERT(fe->i_size == i_size_read(inode));
if (new_i_size > fe->i_size) {
- mlog(0, "asked to truncate file with size (%llu) "
- "to size (%llu)!\n", fe->i_size, new_i_size);
+ mlog(0, "asked to truncate file with size (%"MLFu64") "
+ "to size (%"MLFu64")!\n",
+ fe->i_size, new_i_size);
status = -EINVAL;
mlog_errno(status);
goto bail;
}
- mlog(0, "inode %llu, i_size = %llu, new_i_size = %llu\n",
+ mlog(0, "inode %"MLFu64", i_size = %"MLFu64", new_i_size = %"MLFu64"\n",
fe->i_blkno, fe->i_size, new_i_size);
/* lets handle the simple truncate cases before doing any more
@@ -688,7 +689,7 @@
}
block = ocfs2_clusters_to_blocks(osb->sb, bit_off);
- mlog(0, "Allocating %u clusters at block %u for inode %llu\n",
+ mlog(0, "Allocating %u clusters at block %u for inode %"MLFu64"\n",
num_bits, bit_off, OCFS_I(inode)->ip_blkno);
status = ocfs2_insert_extent(osb, handle, inode, fe_bh, block,
num_bits, meta_ac);
@@ -764,7 +765,7 @@
ocfs2_alloc_context *meta_ac = NULL;
enum ocfs2_alloc_restarted why;
- mlog_entry("(new_i_size=%llu)\n", new_i_size);
+ mlog_entry("(new_i_size=%"MLFu64")\n", new_i_size);
*bytes_extended = 0;
@@ -798,8 +799,8 @@
clusters_to_add = ocfs2_clusters_for_bytes(osb->sb, new_i_size)
- fe->i_clusters;
- mlog(0, "extend inode %llu, new_i_size = %llu, i_size = %llu, "
- "fe->i_clusters = %u, clusters_to_add = %u\n",
+ mlog(0, "extend inode %"MLFu64", new_i_size = %"MLFu64", "
+ "i_size = %lld, fe->i_clusters = %u, clusters_to_add = %u\n",
OCFS_I(inode)->ip_blkno, new_i_size, i_size_read(inode),
fe->i_clusters, clusters_to_add);
@@ -948,10 +949,10 @@
*bytes_extended += new_fe_size - fe->i_size;
fe->i_size = new_fe_size;
- mlog(0, "fe: i_clusters = %u, i_size=%llu\n", fe->i_clusters,
- fe->i_size);
+ mlog(0, "fe: i_clusters = %u, i_size=%"MLFu64"\n",
+ fe->i_clusters, fe->i_size);
- mlog(0, "inode: ip_clusters=%u, i_size=%llu\n",
+ mlog(0, "inode: ip_clusters=%u, i_size=%lld\n",
OCFS_I(inode)->ip_clusters, i_size_read(inode));
fe->i_ctime = fe->i_mtime = OCFS_CURRENT_TIME;
@@ -1008,7 +1009,7 @@
ocfs_journal_handle *handle = NULL;
mlog_entry ("(0x%p, '%.*s')\n", dentry,
- dentry->d_name.len, dentry->d_name.name);
+ dentry->d_name.len, dentry->d_name.name);
if (attr->ia_valid & ATTR_MODE)
mlog(0, "mode change: %d\n", attr->ia_mode);
@@ -1063,7 +1064,7 @@
&& status != -EINTR
&& status != -ERESTARTSYS)
mlog(ML_ERROR, "status return of %d extending inode "
- "%llu\n", status, OCFS_I(inode)->ip_blkno);
+ "%"MLFu64"\n", status, OCFS_I(inode)->ip_blkno);
status = 0;
newsize = bytes_added + i_size_read(inode);
Modified: trunk/fs/ocfs2/inode.c
===================================================================
--- trunk/fs/ocfs2/inode.c 2005-04-26 01:58:50 UTC (rev 2174)
+++ trunk/fs/ocfs2/inode.c 2005-04-26 03:23:11 UTC (rev 2175)
@@ -111,7 +111,7 @@
ocfs_find_inode_args args;
u32 flags = 0;
- mlog_entry("(blkno = %llu)\n", blkno);
+ mlog_entry("(blkno = %"MLFu64")\n", blkno);
/* Ok. By now we've either got the offsets passed to us by the
* caller, or we just pulled them off the bh. Lets do some
@@ -153,7 +153,7 @@
bail:
if (inode)
- mlog(0, "returning inode with number %llu\n",
+ mlog(0, "returning inode with number %"MLFu64"\n",
OCFS_I(inode)->ip_blkno);
mlog_exit_ptr(inode);
@@ -183,9 +183,9 @@
mlog(ML_ERROR, "inode %lu has no generic_ip (is_bad_inode = "
"%d)!\n", inode->i_ino, is_bad_inode(inode));
if (args)
- mlog(ML_ERROR, "args-blkno = %llu, args->ino = %lu, "
- "args->flags = 0x%x\n", args->blkno, args->ino,
- args->flags);
+ mlog(ML_ERROR, "args-blkno = %"MLFu64", "
+ "args->ino = %lu, args->flags = 0x%x\n",
+ args->blkno, args->ino, args->flags);
BUG();
}
@@ -313,7 +313,7 @@
/* These should be set in read_inode2. */
i->ip_clusters = 0;
i->ip_blkno = 0ULL;
- i->ip_mmu_private = 0ULL;
+ i->ip_mmu_private = 0LL;
i->ip_flags |= OCFS_INODE_INITIALIZED;
return 0;
@@ -330,7 +330,7 @@
ocfs_super *osb;
int status = -EINVAL;
- mlog_entry ("(0x%p, size:%llu)\n", inode, fe->i_size);
+ mlog_entry ("(0x%p, size:%"MLFu64")\n", inode, fe->i_size);
sb = inode->i_sb;
osb = OCFS_SB(sb);
@@ -339,7 +339,7 @@
// inode today. change if needed.
if (!IS_VALID_FILE_ENTRY(fe) || !(fe->i_flags & OCFS2_VALID_FL)) {
mlog(ML_ERROR, "invalid file entry! i_ino=%lu, "
- "fe->i_blkno=%llu, valid_flag = %d\n",
+ "fe->i_blkno=%"MLFu64", valid_flag = %d\n",
inode->i_ino, fe->i_blkno,
(fe->i_flags & OCFS2_VALID_FL));
goto bail;
@@ -389,7 +389,7 @@
if (create_ino)
inode->i_ino = ino_from_blkno(inode->i_sb, fe->i_blkno);
- mlog(0, "blkno = %llu, ino = %lu, create_ino = %s\n",
+ mlog(0, "blkno = %"MLFu64", ino = %lu, create_ino = %s\n",
fe->i_blkno, inode->i_ino, create_ino ? "true" : "false");
inode->i_nlink = fe->i_links_count;
@@ -497,7 +497,7 @@
status = -EINVAL;
if (ocfs_populate_inode (inode, fe, 0) < 0) {
- mlog(ML_ERROR, "populate inode failed! i_blkno=%llu, "
+ mlog(ML_ERROR, "populate inode failed! i_blkno=%"MLFu64", "
"i_ino=%lu\n", fe->i_blkno, inode->i_ino);
make_bad_inode (inode);
goto bail;
@@ -804,8 +804,8 @@
if (!inode)
goto bail;
- mlog(0, "Clearing inode: %llu, nlink = %u)\n", OCFS_I(inode)->ip_blkno,
- inode->i_nlink);
+ mlog(0, "Clearing inode: %"MLFu64", nlink = %u)\n",
+ OCFS_I(inode)->ip_blkno, inode->i_nlink);
/* we should not really be using osb in this context. */
osb = OCFS_SB(inode->i_sb);
@@ -922,7 +922,7 @@
int status = 0;
ocfs_super *osb;
- mlog_entry("(inode = 0x%p, ino = %llu)\n", inode,
+ mlog_entry("(inode = 0x%p, ino = %"MLFu64")\n", inode,
inode ? OCFS_I(inode)->ip_blkno : 0ULL);
if (!inode) {
@@ -969,7 +969,7 @@
ocfs2_dinode *fe = (ocfs2_dinode *) bh->b_data;
#warning "need to check the casts and the endian-ness in this function"
- mlog_entry("(inode %llu)\n", OCFS_I(inode)->ip_blkno);
+ mlog_entry("(inode %"MLFu64")\n", OCFS_I(inode)->ip_blkno);
status = ocfs_journal_access(handle, inode, bh,
OCFS_JOURNAL_ACCESS_WRITE);
Modified: trunk/fs/ocfs2/journal.c
===================================================================
--- trunk/fs/ocfs2/journal.c 2005-04-26 01:58:50 UTC (rev 2174)
+++ trunk/fs/ocfs2/journal.c 2005-04-26 03:23:11 UTC (rev 2175)
@@ -577,7 +577,7 @@
ocfs_set_inode_lock_trans(journal, inode);
ocfs2_meta_unlock(inode, 1);
if (atomic_read(&inode->i_count) == 1)
- mlog(ML_ERROR, "Inode %llu, I'm doing a last iput "
+ mlog(ML_ERROR, "Inode %"MLFu64", I'm doing a last iput "
"for!", OCFS_I(inode)->ip_blkno);
iput(inode);
kmem_cache_free(ocfs2_lock_cache, lock);
@@ -631,23 +631,23 @@
fe = (ocfs2_dinode *) bh->b_data;
if (fe->i_size < OCFS2_MIN_JOURNAL_SIZE) {
- mlog(ML_ERROR, "Journal file size (%llu) is too small!",
+ mlog(ML_ERROR, "Journal file size (%"MLFu64") is too small!",
fe->i_size);
status = -EINVAL;
goto done;
}
- mlog(0, "fe->i_size = %llu\n", fe->i_size);
+ mlog(0, "fe->i_size = %"MLFu64"\n", fe->i_size);
mlog(0, "fe->i_clusters = %u\n", fe->i_clusters);
- mlog(0, "fe->i_blkno = %llu\n", fe->i_blkno);
- mlog(0, "inode->ip_clusters = %u\n",
- OCFS_I(inode)->ip_clusters);
+ mlog(0, "fe->i_blkno = %"MLFu64"\n", fe->i_blkno);
+ mlog(0, "inode->ip_clusters = %u\n", OCFS_I(inode)->ip_clusters);
if (OCFS_I(inode)->ip_clusters != fe->i_clusters)
mlog(ML_ERROR, "inode and fe alloc sizes differ! (%u != %u",
OCFS_I(inode)->ip_clusters, fe->i_clusters);
if (inode->i_size != fe->i_size)
- mlog(ML_ERROR, "inode and fe i_size's differ! (%llu != %llu",
+ mlog(ML_ERROR, "inode and fe i_size's differ! "
+ "(%lld != %"MLFu64")",
inode->i_size, fe->i_size);
OCFS_I(inode)->ip_open_cnt++;
@@ -969,7 +969,7 @@
item = list_entry(p, struct ocfs2_la_recovery_item, lri_list);
list_del_init(&item->lri_list);
- mlog(0, "Clean up local alloc %llu\n",
+ mlog(0, "Clean up local alloc %"MLFu64"\n",
item->lri_dinode->i_blkno);
ret = ocfs_complete_local_alloc_recovery(osb,
@@ -1492,7 +1492,7 @@
continue;
if (de->file_type > OCFS2_FT_MAX) {
mlog(ML_ERROR, "block %llu contains invalid "
- "de: inode = %llu, rec_len = %u, "
+ "de: inode = %"MLFu64", rec_len = %u, "
"name_len = %u, file_type = %u, "
"name='%.*s'\n",
(unsigned long long) bh->b_blocknr,
Modified: trunk/fs/ocfs2/localalloc.c
===================================================================
--- trunk/fs/ocfs2/localalloc.c 2005-04-26 01:58:50 UTC (rev 2174)
+++ trunk/fs/ocfs2/localalloc.c 2005-04-26 03:23:11 UTC (rev 2175)
@@ -164,7 +164,7 @@
alloc = (ocfs2_dinode *) alloc_bh->b_data;
if (!(alloc->i_flags & (OCFS2_LOCAL_ALLOC_FL|OCFS2_BITMAP_FL))) {
- mlog(ML_ERROR, "Invalid local alloc inode, %llu\n",
+ mlog(ML_ERROR, "Invalid local alloc inode, %"MLFu64"\n",
OCFS_I(inode)->ip_blkno);
status = -EINVAL;
goto bail;
@@ -792,8 +792,8 @@
start - count);
mlog(0, "freeing %u bits starting at local "
- "alloc bit %u (la_start_blk = %llu, "
- "blkno = %llu)\n", count, start - count,
+ "alloc bit %u (la_start_blk = %"MLFu64", "
+ "blkno = %"MLFu64")\n", count, start - count,
la_start_blk, blkno);
status = ocfs_free_clusters(handle, main_bm_inode,
Modified: trunk/fs/ocfs2/mmap.c
===================================================================
--- trunk/fs/ocfs2/mmap.c 2005-04-26 01:58:50 UTC (rev 2174)
+++ trunk/fs/ocfs2/mmap.c 2005-04-26 03:23:11 UTC (rev 2175)
@@ -523,14 +523,15 @@
if (filp->f_flags & O_APPEND)
info->wl_newsize = count + i_size_read(inode);
- mlog(0, "ppos=%llu newsize=%llu cursize=%llu\n", saved_ppos,
+ mlog(0, "ppos=%lld newsize=%"MLFu64" cursize=%lld\n", saved_ppos,
info->wl_newsize, i_size_read(inode));
if (info->wl_newsize > i_size_read(inode)) {
if (!level) {
/* we want an extend, but need a higher
* level cluster lock. */
- mlog(0, "inode %llu, had a PR, looping back for EX\n",
+ mlog(0, "inode %"MLFu64", had a PR, looping back "
+ "for EX\n",
OCFS_I(inode)->ip_blkno);
ocfs2_meta_unlock(inode, level);
info->wl_have_target_meta = 0;
@@ -540,7 +541,7 @@
info->wl_extended = 1;
mlog(0, "Writing at EOF, will need more allocation: "
- "i_size=%llu, need=%llu\n", i_size_read(inode),
+ "i_size=%lld, need=%"MLFu64"\n", i_size_read(inode),
info->wl_newsize);
/* If we extend AT ALL here then we update our state
@@ -553,8 +554,8 @@
&& status != -EINTR
&& status != -ENOSPC) {
mlog_errno(status);
- mlog(ML_ERROR, "Failed to extend inode %llu "
- "from %llu to %llu",
+ mlog(ML_ERROR, "Failed to extend inode %"MLFu64
+ " from %lld to %"MLFu64,
OCFS_I(inode)->ip_blkno,
*ppos, info->wl_newsize);
}
@@ -577,7 +578,7 @@
&& status != -EINTR
&& status != -ERESTARTSYS)
mlog(ML_ERROR, "status return of %d extending inode "
- "%llu\n", status, OCFS_I(inode)->ip_blkno);
+ "%"MLFu64"\n", status, OCFS_I(inode)->ip_blkno);
status = 0;
}
Modified: trunk/fs/ocfs2/namei.c
===================================================================
--- trunk/fs/ocfs2/namei.c 2005-04-26 01:58:50 UTC (rev 2174)
+++ trunk/fs/ocfs2/namei.c 2005-04-26 03:23:11 UTC (rev 2175)
@@ -326,7 +326,7 @@
osb = OCFS_SB(dir->i_sb);
if (S_ISDIR(mode) && (dir->i_nlink >= OCFS2_LINK_MAX)) {
- mlog(ML_ERROR, "inode %llu has i_nlink of %u\n",
+ mlog(ML_ERROR, "inode %"MLFu64" has i_nlink of %u\n",
OCFS_I(dir)->ip_blkno, dir->i_nlink);
status = -EMLINK;
goto leave;
@@ -412,7 +412,7 @@
if (ocfs_populate_inode(inode, fe, 1) < 0) {
mlog(ML_ERROR, "populate inode failed! bh->b_blocknr=%llu, "
- "i_blkno=%llu, i_ino=%lu\n",
+ "i_blkno=%"MLFu64", i_ino=%lu\n",
(unsigned long long)new_fe_bh->b_blocknr,
fe->i_blkno, inode->i_ino);
BUG();
@@ -774,7 +774,7 @@
OCFS_ASSERT((dentry->d_parent->d_inode == dir));
- mlog(0, "ino = %llu\n", OCFS_I(inode)->ip_blkno);
+ mlog(0, "ino = %"MLFu64"\n", OCFS_I(inode)->ip_blkno);
status = -EBUSY;
@@ -958,7 +958,7 @@
struct buffer_head **tmpbh;
struct inode *tmpinode;
- mlog_entry("(inode1 = %llu, inode2 = %llu)\n",
+ mlog_entry("(inode1 = %"MLFu64", inode2 = %"MLFu64")\n",
OCFS_I(inode1)->ip_blkno,
OCFS_I(inode2)->ip_blkno);
@@ -1178,7 +1178,7 @@
newfe = (ocfs2_dinode *) newfe_bh->b_data;
mlog(0, "aha rename over existing... new_de=%p "
- "new_blkno=%llu newfebh=%p bhblocknr=%llu\n",
+ "new_blkno=%"MLFu64" newfebh=%p bhblocknr=%llu\n",
new_de, newfe_blkno, newfe_bh, newfe_bh ?
(unsigned long long)newfe_bh->b_blocknr : 0ULL);
@@ -1307,7 +1307,8 @@
if (new_dir_nlink != new_dir->i_nlink) {
if (!new_dir_bh) {
mlog(ML_ERROR, "need to change nlink for new "
- "dir %llu from %d to %d but bh is NULL\n",
+ "dir %"MLFu64" from %d to %d "
+ "but bh is NULL\n",
OCFS_I(new_dir)->ip_blkno,
(int)new_dir_nlink, new_dir->i_nlink);
} else {
@@ -1324,8 +1325,9 @@
if (old_dir_nlink != old_dir->i_nlink) {
if (!old_dir_bh) {
- mlog(ML_ERROR, "need to change nlink for old dir %llu "
- "from %d to %d but bh is NULL!\n",
+ mlog(ML_ERROR, "need to change nlink for old dir "
+ "%"MLFu64" from %d to %d but bh is "
+ "NULL!\n",
OCFS_I(old_dir)->ip_blkno, (int)old_dir_nlink,
old_dir->i_nlink);
} else {
@@ -1593,7 +1595,7 @@
if (ocfs_populate_inode (inode, fe, 1) < 0) {
mlog(ML_ERROR, "populate inode failed! bh->b_blocknr=%llu, "
- "i_blkno=%llu, i_ino=%lu\n",
+ "i_blkno=%"MLFu64", i_ino=%lu\n",
(unsigned long long)new_fe_bh->b_blocknr,
fe->i_blkno, inode->i_ino);
BUG();
@@ -1612,7 +1614,8 @@
handle, data_ac, NULL, NULL);
if (status < 0) {
if (status != -ENOSPC && status != -EINTR) {
- mlog(ML_ERROR, "Failed to extend file to %llu",
+ mlog(ML_ERROR, "Failed to extend file to "
+ "%"MLFu64"\n",
newsize);
mlog_errno(status);
status = -ENOSPC;
@@ -1687,8 +1690,8 @@
error_msg = "directory entry across blocks";
if (error_msg != NULL)
- mlog(ML_ERROR, "bad entry in directory #%llu: %s - "
- "offset=%lu, inode=%llu, rec_len=%d, name_len=%d",
+ mlog(ML_ERROR, "bad entry in directory #%"MLFu64": %s - "
+ "offset=%lu, inode=%"MLFu64", rec_len=%d, name_len=%d",
OCFS_I(dir)->ip_blkno, error_msg, offset,
le64_to_cpu(de->inode), rlen, de->name_len);
return error_msg == NULL ? 1 : 0;
@@ -1990,8 +1993,7 @@
goto bail;
}
- namelen = snprintf(name, OCFS2_MAX_FILENAME_LEN + 1, "%llu",
- blkno);
+ namelen = snprintf(name, OCFS2_MAX_FILENAME_LEN + 1, "%"MLFu64, blkno);
if (namelen <= 0) {
kfree(name);
if (!namelen)
@@ -2000,8 +2002,7 @@
goto bail;
}
- mlog(0, "built filename '%s' for orphan dir (len=%d)\n", name,
- namelen);
+ mlog(0, "built filename '%s' for orphan dir (len=%d)\n", name, namelen);
*retval = name;
bail:
@@ -2166,7 +2167,7 @@
goto leave;
}
- namelen = snprintf(name, OCFS2_MAX_FILENAME_LEN + 1, "%llu",
+ namelen = snprintf(name, OCFS2_MAX_FILENAME_LEN + 1, "%"MLFu64,
OCFS_I(inode)->ip_blkno);
if (namelen <= 0) {
if (namelen)
Modified: trunk/fs/ocfs2/ocfs.h
===================================================================
--- trunk/fs/ocfs2/ocfs.h 2005-04-26 01:58:50 UTC (rev 2174)
+++ trunk/fs/ocfs2/ocfs.h 2005-04-26 03:23:11 UTC (rev 2175)
@@ -196,7 +196,7 @@
spinlock_t ip_lock;
u32 ip_open_cnt;
u32 ip_clusters;
- u64 ip_mmu_private;
+ loff_t ip_mmu_private;
struct ocfs2_extent_map ip_map;
struct list_head ip_io_markers;
Modified: trunk/fs/ocfs2/proc.c
===================================================================
--- trunk/fs/ocfs2/proc.c 2005-04-26 01:58:50 UTC (rev 2174)
+++ trunk/fs/ocfs2/proc.c 2005-04-26 03:23:11 UTC (rev 2175)
@@ -390,10 +390,10 @@
mlog_entry_void ();
-#define PROC_STATS \
+#define PROC_STATS \
"Number of nodes : %u\n" \
"Cluster size : %d\n" \
- "Volume size : %llu\n" \
+ "Volume size : %"MLFu64"\n" \
"Open Transactions: : %u\n"
len = sprintf (page, PROC_STATS, osb->num_nodes, osb->s_clustersize,
Modified: trunk/fs/ocfs2/suballoc.c
===================================================================
--- trunk/fs/ocfs2/suballoc.c 2005-04-26 01:58:50 UTC (rev 2174)
+++ trunk/fs/ocfs2/suballoc.c 2005-04-26 03:23:11 UTC (rev 2175)
@@ -334,7 +334,7 @@
/* setup the group */
bg_blkno = ocfs2_clusters_to_blocks(osb->sb, bit_off);
- mlog(0, "new descriptor, record %u, at block %llu\n",
+ mlog(0, "new descriptor, record %u, at block %"MLFu64"\n",
alloc_rec, bg_blkno);
bg_bh = sb_getblk(osb->sb, bg_blkno);
@@ -851,9 +851,9 @@
OCFS_ASSERT_RO(IS_VALID_GROUP_DESC(bg));
OCFS_ASSERT_RO(IS_VALID_GROUP_DESC(prev_bg));
- mlog(0, "In suballoc %llu, chain %u, move group %llu to top, "
- "prev = %llu\n", fe->i_blkno, chain, bg->bg_blkno,
- prev_bg->bg_blkno);
+ mlog(0, "In suballoc %"MLFu64", chain %u, move group %"MLFu64" to "
+ "top, prev = %"MLFu64"\n",
+ fe->i_blkno, chain, bg->bg_blkno, prev_bg->bg_blkno);
fe_ptr = fe->id2.i_chain.cl_recs[chain].c_blkno;
bg_ptr = bg->bg_next_group;
@@ -991,7 +991,7 @@
ocfs2_group_desc *bg;
chain = ac->ac_chain;
- mlog(0, "trying to alloc %u bits from chain %u, inode %llu\n",
+ mlog(0, "trying to alloc %u bits from chain %u, inode %"MLFu64"\n",
bits_wanted, chain, OCFS_I(alloc_inode)->ip_blkno);
status = ocfs_read_block(OCFS2_SB(alloc_inode->i_sb),
@@ -1036,8 +1036,8 @@
goto bail;
}
- mlog(0, "alloc succeeds: we give %u bits from block group "
- "%llu\n", tmp_bits, bg->bg_blkno);
+ mlog(0, "alloc succeeds: we give %u bits from block group %"MLFu64"\n",
+ tmp_bits, bg->bg_blkno);
*num_bits = tmp_bits;
@@ -1101,7 +1101,7 @@
goto bail;
}
- mlog(0, "Allocated %u bits from suballocator %llu\n",
+ mlog(0, "Allocated %u bits from suballocator %"MLFu64"\n",
*num_bits, fe->i_blkno);
*bg_blkno = bg->bg_blkno;
@@ -1466,9 +1466,9 @@
OCFS_ASSERT((count + start_bit)
<= ((u32) cl->cl_cpg * (u32) cl->cl_bpc));
- mlog(0, "suballocator %llu: freeing %u bits from group %llu, "
- "starting at %u\n", OCFS_I(alloc_inode)->ip_blkno, count,
- bg_blkno, start_bit);
+ mlog(0, "suballocator %"MLFu64": freeing %u bits from group %"MLFu64
+ ", starting at %u\n",
+ OCFS_I(alloc_inode)->ip_blkno, count, bg_blkno, start_bit);
status = ocfs_read_block(osb, bg_blkno, &group_bh, OCFS_BH_CACHED,
alloc_inode);
@@ -1569,10 +1569,10 @@
ocfs2_block_to_cluster_group(bitmap_inode, start_blk, &bg_blkno,
&bg_start_bit);
- mlog(0, "want to free %u clusters starting at block %llu\n",
+ mlog(0, "want to free %u clusters starting at block %"MLFu64"\n",
num_clusters, start_blk);
- mlog(0, "bg_blkno = %llu, bg_start_bit = %u\n", bg_blkno,
- bg_start_bit);
+ mlog(0, "bg_blkno = %"MLFu64", bg_start_bit = %u\n",
+ bg_blkno, bg_start_bit);
status = ocfs_free_suballoc_bits(handle, bitmap_inode, bitmap_bh,
bg_start_bit, bg_blkno,
@@ -1593,18 +1593,18 @@
printk("bg_free_bits_count: %u\n", bg->bg_free_bits_count);
printk("bg_chain: %u\n", bg->bg_chain);
printk("bg_generation: %u\n", le32_to_cpu(bg->bg_generation));
- printk("bg_next_group: %llu\n", bg->bg_next_group);
- printk("bg_parent_dinode: %llu\n", bg->bg_parent_dinode);
- printk("bg_blkno: %llu\n", bg->bg_blkno);
+ printk("bg_next_group: %"MLFu64"\n", bg->bg_next_group);
+ printk("bg_parent_dinode: %"MLFu64"\n", bg->bg_parent_dinode);
+ printk("bg_blkno: %"MLFu64"\n", bg->bg_blkno);
}
static inline void debug_suballoc_inode(ocfs2_dinode *fe)
{
int i;
- printk("Suballoc Inode %llu:\n", fe->i_blkno);
+ printk("Suballoc Inode %"MLFu64":\n", fe->i_blkno);
printk("i_signature: %s\n", fe->i_signature);
- printk("i_size: %llu\n", fe->i_size);
+ printk("i_size: %"MLFu64"\n", fe->i_size);
printk("i_clusters: %u\n", fe->i_clusters);
printk("i_generation: %u\n",
le32_to_cpu(fe->i_generation));
@@ -1622,7 +1622,7 @@
fe->id2.i_chain.cl_recs[i].c_free);
printk("fe->id2.i_chain.cl_recs[%d].c_total: %u\n", i,
fe->id2.i_chain.cl_recs[i].c_total);
- printk("fe->id2.i_chain.cl_recs[%d].c_blkno: %llu\n", i,
+ printk("fe->id2.i_chain.cl_recs[%d].c_blkno: %"MLFu64"\n", i,
fe->id2.i_chain.cl_recs[i].c_blkno);
}
}
Modified: trunk/fs/ocfs2/super.c
===================================================================
--- trunk/fs/ocfs2/super.c 2005-04-26 01:58:50 UTC (rev 2174)
+++ trunk/fs/ocfs2/super.c 2005-04-26 03:23:11 UTC (rev 2175)
@@ -1195,8 +1195,8 @@
osb->fs_generation = le32_to_cpu(di->i_fs_generation);
mlog(0, "vol_label: %s\n", osb->vol_label);
mlog(0, "uuid: %s\n", osb->uuid_str);
- mlog(0, "root_blkno=%llu, system_dir_blkno=%llu\n", osb->root_blkno,
- osb->system_dir_blkno);
+ mlog(0, "root_blkno=%"MLFu64", system_dir_blkno=%"MLFu64"\n",
+ osb->root_blkno, osb->system_dir_blkno);
atomic_set (&osb->vol_state, VOLUME_INIT);
@@ -1250,7 +1250,7 @@
osb->bitmap_cpg = di->id2.i_chain.cl_cpg;
osb->num_clusters = le32_to_cpu(di->id1.bitmap1.i_total);
brelse(bitmap_bh);
- mlog(0, "cluster bitmap inode: %llu, clusters per group: %u\n",
+ mlog(0, "cluster bitmap inode: %"MLFu64", clusters per group: %u\n",
osb->bitmap_blkno, osb->bitmap_cpg);
status = ocfs2_init_slot_info(osb);
@@ -1311,7 +1311,7 @@
OCFS2_MINOR_REV_LEVEL);
} else if (bh->b_blocknr != di->i_blkno) {
mlog(ML_ERROR, "bad block number on superblock: "
- "found %llu, should be %llu\n",
+ "found %"MLFu64", should be %llu\n",
di->i_blkno, (unsigned long long)bh->b_blocknr);
} else if (le32_to_cpu(di->id2.i_super.s_clustersize_bits) < 12 ||
le32_to_cpu(di->id2.i_super.s_clustersize_bits) > 20) {
Modified: trunk/fs/ocfs2/vote.c
===================================================================
--- trunk/fs/ocfs2/vote.c 2005-04-26 01:58:50 UTC (rev 2174)
+++ trunk/fs/ocfs2/vote.c 2005-04-26 03:23:11 UTC (rev 2175)
@@ -170,7 +170,7 @@
}
if (filemap_fdatawrite(inode->i_mapping)) {
- mlog(ML_ERROR, "Could not sync inode %llu for delete!\n",
+ mlog(ML_ERROR, "Could not sync inode %"MLFu64" for delete!\n",
OCFS_I(inode)->ip_blkno);
goto done;
}
@@ -227,7 +227,7 @@
generation = ntohl(hdr->h_generation);
node_num = ntohl(hdr->h_node_num);
- mlog(0, "processing vote: request = %u, blkno = %llu, "
+ mlog(0, "processing vote: request = %u, blkno = %"MLFu64", "
"generation = %u, node_num = %u\n", request, blkno,
generation, node_num);
@@ -734,7 +734,7 @@
mlog(0, "received response message:\n");
mlog(0, "h_response_id = %u\n", response_id);
mlog(0, "h_request = %u\n", ntohl(resp->r_hdr.h_request));
- mlog(0, "h_blkno = %llu\n", be64_to_cpu(resp->r_hdr.h_blkno));
+ mlog(0, "h_blkno = %"MLFu64"\n", be64_to_cpu(resp->r_hdr.h_blkno));
mlog(0, "h_generation = %u\n", ntohl(resp->r_hdr.h_generation));
mlog(0, "h_node_num = %u\n", node_num);
mlog(0, "r_response = %d\n", response_status);
@@ -780,7 +780,7 @@
mlog(0, "scheduling vote request:\n");
mlog(0, "h_response_id = %u\n", work->w_msg.v_hdr.h_response_id);
mlog(0, "h_request = %u\n", work->w_msg.v_hdr.h_request);
- mlog(0, "h_blkno = %llu\n", work->w_msg.v_hdr.h_blkno);
+ mlog(0, "h_blkno = %"MLFu64"\n", work->w_msg.v_hdr.h_blkno);
mlog(0, "h_generation = %u\n", work->w_msg.v_hdr.h_generation);
mlog(0, "h_node_num = %u\n", work->w_msg.v_hdr.h_node_num);
More information about the Ocfs2-commits
mailing list