git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
fs
/
ocfs2
/
export.c
diff --git
a/fs/ocfs2/export.c
b/fs/ocfs2/export.c
index
ec55ab3
..
5810160
100644
(file)
--- a/
fs/ocfs2/export.c
+++ b/
fs/ocfs2/export.c
@@
-95,8
+95,8
@@
static struct dentry *ocfs2_get_parent(struct dentry *child)
mlog_entry("(0x%p, '%.*s')\n", child,
child->d_name.len, child->d_name.name);
mlog_entry("(0x%p, '%.*s')\n", child,
child->d_name.len, child->d_name.name);
- mlog(0, "find parent of directory %
llu
\n",
-
(unsigned long long)
OCFS2_I(dir)->ip_blkno);
+ mlog(0, "find parent of directory %
"MLFu64"
\n",
+ OCFS2_I(dir)->ip_blkno);
status = ocfs2_meta_lock(dir, NULL, NULL, 0);
if (status < 0) {
status = ocfs2_meta_lock(dir, NULL, NULL, 0);
if (status < 0) {
@@
-115,8
+115,7
@@
static struct dentry *ocfs2_get_parent(struct dentry *child)
inode = ocfs2_iget(OCFS2_SB(dir->i_sb), blkno);
if (IS_ERR(inode)) {
inode = ocfs2_iget(OCFS2_SB(dir->i_sb), blkno);
if (IS_ERR(inode)) {
- mlog(ML_ERROR, "Unable to create inode %llu\n",
- (unsigned long long)blkno);
+ mlog(ML_ERROR, "Unable to create inode %"MLFu64"\n", blkno);
parent = ERR_PTR(-EACCES);
goto bail_unlock;
}
parent = ERR_PTR(-EACCES);
goto bail_unlock;
}
@@
-161,8
+160,8
@@
static int ocfs2_encode_fh(struct dentry *dentry, __be32 *fh, int *max_len,
blkno = OCFS2_I(inode)->ip_blkno;
generation = inode->i_generation;
blkno = OCFS2_I(inode)->ip_blkno;
generation = inode->i_generation;
- mlog(0, "Encoding fh: blkno: %
llu
, generation: %u\n",
-
(unsigned long long)
blkno, generation);
+ mlog(0, "Encoding fh: blkno: %
"MLFu64"
, generation: %u\n",
+ blkno, generation);
len = 3;
fh[0] = cpu_to_le32((u32)(blkno >> 32));
len = 3;
fh[0] = cpu_to_le32((u32)(blkno >> 32));
@@
-187,8
+186,8
@@
static int ocfs2_encode_fh(struct dentry *dentry, __be32 *fh, int *max_len,
len = 6;
type = 2;
len = 6;
type = 2;
- mlog(0, "Encoding parent: blkno: %
llu
, generation: %u\n",
-
(unsigned long long)
blkno, generation);
+ mlog(0, "Encoding parent: blkno: %
"MLFu64"
, generation: %u\n",
+ blkno, generation);
}
*max_len = len;
}
*max_len = len;
@@
-221,17
+220,16
@@
static struct dentry *ocfs2_decode_fh(struct super_block *sb, __be32 *fh,
parent.ih_blkno |= (u64)le32_to_cpu(fh[4]);
parent.ih_generation = le32_to_cpu(fh[5]);
parent.ih_blkno |= (u64)le32_to_cpu(fh[4]);
parent.ih_generation = le32_to_cpu(fh[5]);
- mlog(0, "Decoding parent: blkno: %llu, generation: %u\n",
- (unsigned long long)parent.ih_blkno,
- parent.ih_generation);
+ mlog(0, "Decoding parent: blkno: %"MLFu64", generation: %u\n",
+ parent.ih_blkno, parent.ih_generation);
}
handle.ih_blkno = (u64)le32_to_cpu(fh[0]) << 32;
handle.ih_blkno |= (u64)le32_to_cpu(fh[1]);
handle.ih_generation = le32_to_cpu(fh[2]);
}
handle.ih_blkno = (u64)le32_to_cpu(fh[0]) << 32;
handle.ih_blkno |= (u64)le32_to_cpu(fh[1]);
handle.ih_generation = le32_to_cpu(fh[2]);
- mlog(0, "Encoding fh: blkno: %
llu
, generation: %u\n",
-
(unsigned long long)
handle.ih_blkno, handle.ih_generation);
+ mlog(0, "Encoding fh: blkno: %
"MLFu64"
, generation: %u\n",
+ handle.ih_blkno, handle.ih_generation);
ret = ocfs2_export_ops.find_exported_dentry(sb, &handle, &parent,
acceptable, context);
ret = ocfs2_export_ops.find_exported_dentry(sb, &handle, &parent,
acceptable, context);