| Message ID | 1463970656-18413-1-git-send-email-zren@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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@suse.com> Looks good to me, thanks. Reviewed-by: Joseph Qi <joseph.qi@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; > } > >
>>> > 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@suse.com> > Looks good to me, thanks. > Reviewed-by: Joseph Qi <joseph.qi@huawei.com> Reviewed-by: Gang He <ghe@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; >> } >> >> > > > > _______________________________________________ > Ocfs2-devel mailing list > Ocfs2-devel@oss.oracle.com > https://oss.oracle.com/mailman/listinfo/ocfs2-devel
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; }
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@suse.com> --- fs/ocfs2/inode.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)