diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ocfs2/export.c | 5 | ||||
-rw-r--r-- | fs/ocfs2/inode.c | 11 |
2 files changed, 4 insertions, 12 deletions
diff --git a/fs/ocfs2/export.c b/fs/ocfs2/export.c index 06be6e774cf9..56e1fefc1205 100644 --- a/fs/ocfs2/export.c +++ b/fs/ocfs2/export.c | |||
@@ -60,14 +60,11 @@ static struct dentry *ocfs2_get_dentry(struct super_block *sb, void *vobjp) | |||
60 | 60 | ||
61 | inode = ocfs2_iget(OCFS2_SB(sb), handle->ih_blkno, 0); | 61 | inode = ocfs2_iget(OCFS2_SB(sb), handle->ih_blkno, 0); |
62 | 62 | ||
63 | if (IS_ERR(inode)) { | 63 | if (IS_ERR(inode)) |
64 | mlog_errno(PTR_ERR(inode)); | ||
65 | return (void *)inode; | 64 | return (void *)inode; |
66 | } | ||
67 | 65 | ||
68 | if (handle->ih_generation != inode->i_generation) { | 66 | if (handle->ih_generation != inode->i_generation) { |
69 | iput(inode); | 67 | iput(inode); |
70 | mlog_errno(-ESTALE); | ||
71 | return ERR_PTR(-ESTALE); | 68 | return ERR_PTR(-ESTALE); |
72 | } | 69 | } |
73 | 70 | ||
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c index e4d91493d7d7..28ab56f2b98c 100644 --- a/fs/ocfs2/inode.c +++ b/fs/ocfs2/inode.c | |||
@@ -146,7 +146,6 @@ struct inode *ocfs2_iget(struct ocfs2_super *osb, u64 blkno, int flags) | |||
146 | if (is_bad_inode(inode)) { | 146 | if (is_bad_inode(inode)) { |
147 | iput(inode); | 147 | iput(inode); |
148 | inode = ERR_PTR(-ESTALE); | 148 | inode = ERR_PTR(-ESTALE); |
149 | mlog_errno(PTR_ERR(inode)); | ||
150 | goto bail; | 149 | goto bail; |
151 | } | 150 | } |
152 | 151 | ||
@@ -155,8 +154,7 @@ bail: | |||
155 | mlog(0, "returning inode with number %llu\n", | 154 | mlog(0, "returning inode with number %llu\n", |
156 | (unsigned long long)OCFS2_I(inode)->ip_blkno); | 155 | (unsigned long long)OCFS2_I(inode)->ip_blkno); |
157 | mlog_exit_ptr(inode); | 156 | mlog_exit_ptr(inode); |
158 | } else | 157 | } |
159 | mlog_errno(PTR_ERR(inode)); | ||
160 | 158 | ||
161 | return inode; | 159 | return inode; |
162 | } | 160 | } |
@@ -247,7 +245,7 @@ int ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe, | |||
247 | * today. change if needed. */ | 245 | * today. change if needed. */ |
248 | if (!OCFS2_IS_VALID_DINODE(fe) || | 246 | if (!OCFS2_IS_VALID_DINODE(fe) || |
249 | !(fe->i_flags & cpu_to_le32(OCFS2_VALID_FL))) { | 247 | !(fe->i_flags & cpu_to_le32(OCFS2_VALID_FL))) { |
250 | mlog(ML_ERROR, "Invalid dinode: i_ino=%lu, i_blkno=%llu, " | 248 | mlog(0, "Invalid dinode: i_ino=%lu, i_blkno=%llu, " |
251 | "signature = %.*s, flags = 0x%x\n", | 249 | "signature = %.*s, flags = 0x%x\n", |
252 | inode->i_ino, | 250 | inode->i_ino, |
253 | (unsigned long long)le64_to_cpu(fe->i_blkno), 7, | 251 | (unsigned long long)le64_to_cpu(fe->i_blkno), 7, |
@@ -478,11 +476,8 @@ static int ocfs2_read_locked_inode(struct inode *inode, | |||
478 | S_ISBLK(le16_to_cpu(fe->i_mode))) | 476 | S_ISBLK(le16_to_cpu(fe->i_mode))) |
479 | inode->i_rdev = huge_decode_dev(le64_to_cpu(fe->id1.dev1.i_rdev)); | 477 | inode->i_rdev = huge_decode_dev(le64_to_cpu(fe->id1.dev1.i_rdev)); |
480 | 478 | ||
481 | if (ocfs2_populate_inode(inode, fe, 0) < 0) { | 479 | if (ocfs2_populate_inode(inode, fe, 0) < 0) |
482 | mlog(ML_ERROR, "populate failed! i_blkno=%llu, i_ino=%lu\n", | ||
483 | (unsigned long long)fe->i_blkno, inode->i_ino); | ||
484 | goto bail; | 480 | goto bail; |
485 | } | ||
486 | 481 | ||
487 | BUG_ON(args->fi_blkno != le64_to_cpu(fe->i_blkno)); | 482 | BUG_ON(args->fi_blkno != le64_to_cpu(fe->i_blkno)); |
488 | 483 | ||