gfs2: Improve gfs2_make_fs_rw error handling
In gfs2_make_fs_rw(), make sure to call gfs2_consist() to report an inconsistency and mark the filesystem as withdrawn when gfs2_find_jhead() fails. At the end of gfs2_make_fs_rw(), when we discover that the filesystem has been withdrawn, make sure we report an error. This also replaces the gfs2_withdrawn() check after gfs2_find_jhead(). Reported-by: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp> Cc: syzbot+f51cb4b9afbd87ec06f2@syzkaller.appspotmail.com Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
This commit is contained in:
parent
445cb1277e
commit
b66f723bb5
|
@ -138,8 +138,10 @@ int gfs2_make_fs_rw(struct gfs2_sbd *sdp)
|
|||
return -EIO;
|
||||
|
||||
error = gfs2_find_jhead(sdp->sd_jdesc, &head, false);
|
||||
if (error || gfs2_withdrawn(sdp))
|
||||
if (error) {
|
||||
gfs2_consist(sdp);
|
||||
return error;
|
||||
}
|
||||
|
||||
if (!(head.lh_flags & GFS2_LOG_HEAD_UNMOUNT)) {
|
||||
gfs2_consist(sdp);
|
||||
|
@ -151,7 +153,9 @@ int gfs2_make_fs_rw(struct gfs2_sbd *sdp)
|
|||
gfs2_log_pointers_init(sdp, head.lh_blkno);
|
||||
|
||||
error = gfs2_quota_init(sdp);
|
||||
if (!error && !gfs2_withdrawn(sdp))
|
||||
if (!error && gfs2_withdrawn(sdp))
|
||||
error = -EIO;
|
||||
if (!error)
|
||||
set_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags);
|
||||
return error;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue