diff options
Diffstat (limited to 'fs/ocfs2/export.c')
-rw-r--r-- | fs/ocfs2/export.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/fs/ocfs2/export.c b/fs/ocfs2/export.c index 5810160d92a8..ec55ab3c1214 100644 --- a/fs/ocfs2/export.c +++ b/fs/ocfs2/export.c | |||
@@ -95,8 +95,8 @@ static struct dentry *ocfs2_get_parent(struct dentry *child) | |||
95 | mlog_entry("(0x%p, '%.*s')\n", child, | 95 | mlog_entry("(0x%p, '%.*s')\n", child, |
96 | child->d_name.len, child->d_name.name); | 96 | child->d_name.len, child->d_name.name); |
97 | 97 | ||
98 | mlog(0, "find parent of directory %"MLFu64"\n", | 98 | mlog(0, "find parent of directory %llu\n", |
99 | OCFS2_I(dir)->ip_blkno); | 99 | (unsigned long long)OCFS2_I(dir)->ip_blkno); |
100 | 100 | ||
101 | status = ocfs2_meta_lock(dir, NULL, NULL, 0); | 101 | status = ocfs2_meta_lock(dir, NULL, NULL, 0); |
102 | if (status < 0) { | 102 | if (status < 0) { |
@@ -115,7 +115,8 @@ static struct dentry *ocfs2_get_parent(struct dentry *child) | |||
115 | 115 | ||
116 | inode = ocfs2_iget(OCFS2_SB(dir->i_sb), blkno); | 116 | inode = ocfs2_iget(OCFS2_SB(dir->i_sb), blkno); |
117 | if (IS_ERR(inode)) { | 117 | if (IS_ERR(inode)) { |
118 | mlog(ML_ERROR, "Unable to create inode %"MLFu64"\n", blkno); | 118 | mlog(ML_ERROR, "Unable to create inode %llu\n", |
119 | (unsigned long long)blkno); | ||
119 | parent = ERR_PTR(-EACCES); | 120 | parent = ERR_PTR(-EACCES); |
120 | goto bail_unlock; | 121 | goto bail_unlock; |
121 | } | 122 | } |
@@ -160,8 +161,8 @@ static int ocfs2_encode_fh(struct dentry *dentry, __be32 *fh, int *max_len, | |||
160 | blkno = OCFS2_I(inode)->ip_blkno; | 161 | blkno = OCFS2_I(inode)->ip_blkno; |
161 | generation = inode->i_generation; | 162 | generation = inode->i_generation; |
162 | 163 | ||
163 | mlog(0, "Encoding fh: blkno: %"MLFu64", generation: %u\n", | 164 | mlog(0, "Encoding fh: blkno: %llu, generation: %u\n", |
164 | blkno, generation); | 165 | (unsigned long long)blkno, generation); |
165 | 166 | ||
166 | len = 3; | 167 | len = 3; |
167 | fh[0] = cpu_to_le32((u32)(blkno >> 32)); | 168 | fh[0] = cpu_to_le32((u32)(blkno >> 32)); |
@@ -186,8 +187,8 @@ static int ocfs2_encode_fh(struct dentry *dentry, __be32 *fh, int *max_len, | |||
186 | len = 6; | 187 | len = 6; |
187 | type = 2; | 188 | type = 2; |
188 | 189 | ||
189 | mlog(0, "Encoding parent: blkno: %"MLFu64", generation: %u\n", | 190 | mlog(0, "Encoding parent: blkno: %llu, generation: %u\n", |
190 | blkno, generation); | 191 | (unsigned long long)blkno, generation); |
191 | } | 192 | } |
192 | 193 | ||
193 | *max_len = len; | 194 | *max_len = len; |
@@ -220,16 +221,17 @@ static struct dentry *ocfs2_decode_fh(struct super_block *sb, __be32 *fh, | |||
220 | parent.ih_blkno |= (u64)le32_to_cpu(fh[4]); | 221 | parent.ih_blkno |= (u64)le32_to_cpu(fh[4]); |
221 | parent.ih_generation = le32_to_cpu(fh[5]); | 222 | parent.ih_generation = le32_to_cpu(fh[5]); |
222 | 223 | ||
223 | mlog(0, "Decoding parent: blkno: %"MLFu64", generation: %u\n", | 224 | mlog(0, "Decoding parent: blkno: %llu, generation: %u\n", |
224 | parent.ih_blkno, parent.ih_generation); | 225 | (unsigned long long)parent.ih_blkno, |
226 | parent.ih_generation); | ||
225 | } | 227 | } |
226 | 228 | ||
227 | handle.ih_blkno = (u64)le32_to_cpu(fh[0]) << 32; | 229 | handle.ih_blkno = (u64)le32_to_cpu(fh[0]) << 32; |
228 | handle.ih_blkno |= (u64)le32_to_cpu(fh[1]); | 230 | handle.ih_blkno |= (u64)le32_to_cpu(fh[1]); |
229 | handle.ih_generation = le32_to_cpu(fh[2]); | 231 | handle.ih_generation = le32_to_cpu(fh[2]); |
230 | 232 | ||
231 | mlog(0, "Encoding fh: blkno: %"MLFu64", generation: %u\n", | 233 | mlog(0, "Encoding fh: blkno: %llu, generation: %u\n", |
232 | handle.ih_blkno, handle.ih_generation); | 234 | (unsigned long long)handle.ih_blkno, handle.ih_generation); |
233 | 235 | ||
234 | ret = ocfs2_export_ops.find_exported_dentry(sb, &handle, &parent, | 236 | ret = ocfs2_export_ops.find_exported_dentry(sb, &handle, &parent, |
235 | acceptable, context); | 237 | acceptable, context); |