[Ocfs2-devel] [PATCH v2] ocfs2: return -EROFS to mount.ocfs2 if inode block is invalid

[Changwei Ge]

On 2017/12/26 19:23, piaojun wrote:
> 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 <piaojun at huawei.com>
>>> Reviewed-by: Alex Chen <alex.chen at huawei.com>
>>> ---
>>>    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.

After removing that comment line, please feel free to use my
Reviewed-by: Changwei Ge <ge.changwei at h3c.com>

Thanks,
Changwei

> 
> 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;
>>>
>>
>> .
>>
>