ocfs2: cleanup ocfs2_iget() errors

Get rid of some error prints in the ocfs2_iget() path from
ocfs2_get_dentry(). NFSD can easily cause us to read stale inodes.

Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>

+4 -12
+1 -4
fs/ocfs2/export.c
··· 60 61 inode = ocfs2_iget(OCFS2_SB(sb), handle->ih_blkno, 0); 62 63 - if (IS_ERR(inode)) { 64 - mlog_errno(PTR_ERR(inode)); 65 return (void *)inode; 66 - } 67 68 if (handle->ih_generation != inode->i_generation) { 69 iput(inode); 70 - mlog_errno(-ESTALE); 71 return ERR_PTR(-ESTALE); 72 } 73
··· 60 61 inode = ocfs2_iget(OCFS2_SB(sb), handle->ih_blkno, 0); 62 63 + if (IS_ERR(inode)) 64 return (void *)inode; 65 66 if (handle->ih_generation != inode->i_generation) { 67 iput(inode); 68 return ERR_PTR(-ESTALE); 69 } 70
+3 -8
fs/ocfs2/inode.c
··· 146 if (is_bad_inode(inode)) { 147 iput(inode); 148 inode = ERR_PTR(-ESTALE); 149 - mlog_errno(PTR_ERR(inode)); 150 goto bail; 151 } 152 ··· 154 mlog(0, "returning inode with number %llu\n", 155 (unsigned long long)OCFS2_I(inode)->ip_blkno); 156 mlog_exit_ptr(inode); 157 - } else 158 - mlog_errno(PTR_ERR(inode)); 159 160 return inode; 161 } ··· 245 * today. change if needed. */ 246 if (!OCFS2_IS_VALID_DINODE(fe) || 247 !(fe->i_flags & cpu_to_le32(OCFS2_VALID_FL))) { 248 - mlog(ML_ERROR, "Invalid dinode: i_ino=%lu, i_blkno=%llu, " 249 "signature = %.*s, flags = 0x%x\n", 250 inode->i_ino, 251 (unsigned long long)le64_to_cpu(fe->i_blkno), 7, ··· 476 S_ISBLK(le16_to_cpu(fe->i_mode))) 477 inode->i_rdev = huge_decode_dev(le64_to_cpu(fe->id1.dev1.i_rdev)); 478 479 - if (ocfs2_populate_inode(inode, fe, 0) < 0) { 480 - mlog(ML_ERROR, "populate failed! i_blkno=%llu, i_ino=%lu\n", 481 - (unsigned long long)fe->i_blkno, inode->i_ino); 482 goto bail; 483 - } 484 485 BUG_ON(args->fi_blkno != le64_to_cpu(fe->i_blkno)); 486
··· 146 if (is_bad_inode(inode)) { 147 iput(inode); 148 inode = ERR_PTR(-ESTALE); 149 goto bail; 150 } 151 ··· 155 mlog(0, "returning inode with number %llu\n", 156 (unsigned long long)OCFS2_I(inode)->ip_blkno); 157 mlog_exit_ptr(inode); 158 + } 159 160 return inode; 161 } ··· 247 * today. change if needed. */ 248 if (!OCFS2_IS_VALID_DINODE(fe) || 249 !(fe->i_flags & cpu_to_le32(OCFS2_VALID_FL))) { 250 + mlog(0, "Invalid dinode: i_ino=%lu, i_blkno=%llu, " 251 "signature = %.*s, flags = 0x%x\n", 252 inode->i_ino, 253 (unsigned long long)le64_to_cpu(fe->i_blkno), 7, ··· 478 S_ISBLK(le16_to_cpu(fe->i_mode))) 479 inode->i_rdev = huge_decode_dev(le64_to_cpu(fe->id1.dev1.i_rdev)); 480 481 + if (ocfs2_populate_inode(inode, fe, 0) < 0) 482 goto bail; 483 484 BUG_ON(args->fi_blkno != le64_to_cpu(fe->i_blkno)); 485