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