Eric Ren
2016-May-23 02:30 UTC
[Ocfs2-devel] [PATCH] ocfs2: fix improper handling of return errno
Previously, if bad inode was found in ocfs2_iget(), -ESTALE?was
returned back to the caller anyway. Since commit d2b9d71a2da7
("ocfs2: check/fix inode block for online file check") can handle
with return value from ocfs2_read_locked_inode() now, we know the
exact errno returned for us.
Signed-off-by: Eric Ren <zren at suse.com>
---
fs/ocfs2/inode.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index ba495be..fee5ec6 100644
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -176,12 +176,7 @@ struct inode *ocfs2_iget(struct ocfs2_super *osb, u64
blkno, unsigned flags,
}
if (is_bad_inode(inode)) {
iput(inode);
- if ((flags & OCFS2_FI_FLAG_FILECHECK_CHK) ||
- (flags & OCFS2_FI_FLAG_FILECHECK_FIX))
- /* Return OCFS2_FILECHECK_ERR_XXX related errno */
- inode = ERR_PTR(rc);
- else
- inode = ERR_PTR(-ESTALE);
+ inode = ERR_PTR(rc);
goto bail;
}
--
2.6.6
Joseph Qi
2016-May-23 03:21 UTC
[Ocfs2-devel] [PATCH] ocfs2: fix improper handling of return errno
On 2016/5/23 10:30, Eric Ren wrote:> Previously, if bad inode was found in ocfs2_iget(), -ESTALE was > returned back to the caller anyway. Since commit d2b9d71a2da7 > ("ocfs2: check/fix inode block for online file check") can handle > with return value from ocfs2_read_locked_inode() now, we know the > exact errno returned for us. > > Signed-off-by: Eric Ren <zren at suse.com>Looks good to me, thanks. Reviewed-by: Joseph Qi <joseph.qi at huawei.com>> --- > fs/ocfs2/inode.c | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > > diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c > index ba495be..fee5ec6 100644 > --- a/fs/ocfs2/inode.c > +++ b/fs/ocfs2/inode.c > @@ -176,12 +176,7 @@ struct inode *ocfs2_iget(struct ocfs2_super *osb, u64 blkno, unsigned flags, > } > if (is_bad_inode(inode)) { > iput(inode); > - if ((flags & OCFS2_FI_FLAG_FILECHECK_CHK) || > - (flags & OCFS2_FI_FLAG_FILECHECK_FIX)) > - /* Return OCFS2_FILECHECK_ERR_XXX related errno */ > - inode = ERR_PTR(rc); > - else > - inode = ERR_PTR(-ESTALE); > + inode = ERR_PTR(rc); > goto bail; > } > >