From mboxrd@z Thu Jan 1 00:00:00 1970 From: piaojun Date: Tue, 26 Dec 2017 19:22:54 +0800 Subject: [Ocfs2-devel] [PATCH v2] ocfs2: return -EROFS to mount.ocfs2 if inode block is invalid In-Reply-To: <63ADC13FD55D6546B7DECE290D39E373F2909146@H3CMLB12-EX.srv.huawei-3com.com> References: <5A422DFE.8080404@huawei.com> <63ADC13FD55D6546B7DECE290D39E373F2909146@H3CMLB12-EX.srv.huawei-3com.com> Message-ID: <5A42310E.5070401@huawei.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: ocfs2-devel@oss.oracle.com Hi Changwei, On 2017/12/26 19:18, Changwei Ge wrote: > Hi Jun, > > On 2017/12/26 19:10, piaojun wrote: >> If metadata is corrupted such as 'invalid inode block', we will get >> failed by calling 'mount()' and then set filesystem readonly as below: >> >> ocfs2_mount >> ocfs2_initialize_super >> ocfs2_init_global_system_inodes >> ocfs2_iget >> ocfs2_read_locked_inode >> ocfs2_validate_inode_block >> ocfs2_error >> ocfs2_handle_error >> ocfs2_set_ro_flag(osb, 0); // set readonly >> >> In this situation we need return -EROFS to 'mount.ocfs2', so that user >> can fix it by fsck and mount again rather than doing meaningless retry. >> In addition, 'mount.ocfs2' should be updated correspondingly as it only >> return 1 for all errno. And I will post a patch for 'mount.ocfs2' too. >> >> Signed-off-by: Jun Piao >> Reviewed-by: Alex Chen >> --- >> fs/ocfs2/super.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c >> index 040bbb6..f46f6a6 100644 >> --- a/fs/ocfs2/super.c >> +++ b/fs/ocfs2/super.c >> @@ -474,7 +474,7 @@ static int ocfs2_init_global_system_inodes(struct ocfs2_super *osb) >> new = ocfs2_get_system_file_inode(osb, i, osb->slot_num); >> if (!new) { >> ocfs2_release_system_inodes(osb); >> - status = -EINVAL; >> + status = ocfs2_is_soft_readonly(osb) ? -EROFS : -EINVAL; >> mlog_errno(status); >> /* FIXME: Should ERROR_RO_FS */ > > If your patch is applied, shall we remove above comment line? > > Thanks, > Changwei > Good suggestion! If nobody rejects it, I will remove that comment. thanks, Jun >> mlog(ML_ERROR, "Unable to load system inode %d, " >> @@ -505,7 +505,7 @@ static int ocfs2_init_local_system_inodes(struct ocfs2_super *osb) >> new = ocfs2_get_system_file_inode(osb, i, osb->slot_num); >> if (!new) { >> ocfs2_release_system_inodes(osb); >> - status = -EINVAL; >> + status = ocfs2_is_soft_readonly(osb) ? -EROFS : -EINVAL; >> mlog(ML_ERROR, "status=%d, sysfile=%d, slot=%d\n", >> status, i, osb->slot_num); >> goto bail; >> > > . >