aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/aops.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ocfs2/aops.c')
-rw-r--r--fs/ocfs2/aops.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index 8f4467a930a5..bf931ba1d364 100644
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -74,8 +74,8 @@ static int ocfs2_symlink_get_block(struct inode *inode, sector_t iblock,
74 fe = (struct ocfs2_dinode *) bh->b_data; 74 fe = (struct ocfs2_dinode *) bh->b_data;
75 75
76 if (!OCFS2_IS_VALID_DINODE(fe)) { 76 if (!OCFS2_IS_VALID_DINODE(fe)) {
77 mlog(ML_ERROR, "Invalid dinode #%"MLFu64": signature = %.*s\n", 77 mlog(ML_ERROR, "Invalid dinode #%llu: signature = %.*s\n",
78 fe->i_blkno, 7, fe->i_signature); 78 (unsigned long long)fe->i_blkno, 7, fe->i_signature);
79 goto bail; 79 goto bail;
80 } 80 }
81 81
@@ -162,8 +162,8 @@ static int ocfs2_get_block(struct inode *inode, sector_t iblock,
162 NULL); 162 NULL);
163 if (err) { 163 if (err) {
164 mlog(ML_ERROR, "Error %d from get_blocks(0x%p, %llu, 1, " 164 mlog(ML_ERROR, "Error %d from get_blocks(0x%p, %llu, 1, "
165 "%"MLFu64", NULL)\n", err, inode, 165 "%llu, NULL)\n", err, inode, (unsigned long long)iblock,
166 (unsigned long long)iblock, p_blkno); 166 (unsigned long long)p_blkno);
167 goto bail; 167 goto bail;
168 } 168 }
169 169
@@ -171,13 +171,15 @@ static int ocfs2_get_block(struct inode *inode, sector_t iblock,
171 171
172 if (bh_result->b_blocknr == 0) { 172 if (bh_result->b_blocknr == 0) {
173 err = -EIO; 173 err = -EIO;
174 mlog(ML_ERROR, "iblock = %llu p_blkno = %"MLFu64" " 174 mlog(ML_ERROR, "iblock = %llu p_blkno = %llu blkno=(%llu)\n",
175 "blkno=(%"MLFu64")\n", (unsigned long long)iblock, 175 (unsigned long long)iblock,
176 p_blkno, OCFS2_I(inode)->ip_blkno); 176 (unsigned long long)p_blkno,
177 (unsigned long long)OCFS2_I(inode)->ip_blkno);
177 } 178 }
178 179
179 past_eof = ocfs2_blocks_for_bytes(inode->i_sb, i_size_read(inode)); 180 past_eof = ocfs2_blocks_for_bytes(inode->i_sb, i_size_read(inode));
180 mlog(0, "Inode %lu, past_eof = %"MLFu64"\n", inode->i_ino, past_eof); 181 mlog(0, "Inode %lu, past_eof = %llu\n", inode->i_ino,
182 (unsigned long long)past_eof);
181 183
182 if (create && (iblock >= past_eof)) 184 if (create && (iblock >= past_eof))
183 set_buffer_new(bh_result); 185 set_buffer_new(bh_result);