[Ocfs2-devel] [PATCH v1 2/5] ocfs2: change return type of ocfs2_resmap_init
heming.zhao at suse.com
heming.zhao at suse.com
Sat Apr 9 16:29:15 UTC 2022
On 4/9/22 21:14, Joseph Qi wrote:
>
> On 4/8/22 6:30 PM, Heming Zhao wrote:
>> For rewrite error handling of ocfs2_initialize_super, change this
>> function return type from int to void.
>>
> Since ocfs2_resmap_init() always return 0, change it to void.
OK.
>
>> Signed-off-by: Heming Zhao <heming.zhao at suse.com>
>> ---
>> fs/ocfs2/reservations.c | 4 +---
>> fs/ocfs2/reservations.h | 5 ++---
>> fs/ocfs2/super.c | 6 +-----
>> 3 files changed, 4 insertions(+), 11 deletions(-)
>>
>> diff --git a/fs/ocfs2/reservations.c b/fs/ocfs2/reservations.c
>> index 769e466887b0..a9d1296d736d 100644
>> --- a/fs/ocfs2/reservations.c
>> +++ b/fs/ocfs2/reservations.c
>> @@ -198,7 +198,7 @@ void ocfs2_resv_set_type(struct ocfs2_alloc_reservation *resv,
>> resv->r_flags |= flags;
>> }
>>
>> -int ocfs2_resmap_init(struct ocfs2_super *osb,
>> +void ocfs2_resmap_init(struct ocfs2_super *osb,
>> struct ocfs2_reservation_map *resmap)
>> {
>> memset(resmap, 0, sizeof(*resmap));
>> @@ -207,8 +207,6 @@ int ocfs2_resmap_init(struct ocfs2_super *osb,
>> resmap->m_reservations = RB_ROOT;
>> /* m_bitmap_len is initialized to zero by the above memset. */
>> INIT_LIST_HEAD(&resmap->m_lru);
>> -
>> - return 0;
>> }
>>
>> static void ocfs2_resv_mark_lru(struct ocfs2_reservation_map *resmap,
>> diff --git a/fs/ocfs2/reservations.h b/fs/ocfs2/reservations.h
>> index 677c50663595..532d42eb6db7 100644
>> --- a/fs/ocfs2/reservations.h
>> +++ b/fs/ocfs2/reservations.h
>> @@ -78,10 +78,9 @@ void ocfs2_resv_discard(struct ocfs2_reservation_map *resmap,
>> * @ops: unused for now
>> * @max_bitmap_bytes: Maximum size of the bitmap (typically blocksize)
>> *
>> - * Only possible return value other than '0' is -ENOMEM for failure to
>> - * allocation mirror bitmap.
>> + * This function does initialize resmap job.
>> */
> This comments is meaningless, so just remove it looks better.
OK.
- Heming
>
>> -int ocfs2_resmap_init(struct ocfs2_super *osb,
>> +void ocfs2_resmap_init(struct ocfs2_super *osb,
>> struct ocfs2_reservation_map *resmap);
>>
>> /**
>> diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
>> index 8391592817f8..f91c5510bc7e 100644
>> --- a/fs/ocfs2/super.c
>> +++ b/fs/ocfs2/super.c
>> @@ -2111,11 +2111,7 @@ static int ocfs2_initialize_super(struct super_block *sb,
>>
>> init_waitqueue_head(&osb->osb_mount_event);
>>
>> - status = ocfs2_resmap_init(osb, &osb->osb_la_resmap);
>> - if (status) {
>> - mlog_errno(status);
>> - goto bail;
>> - }
>> + ocfs2_resmap_init(osb, &osb->osb_la_resmap);
>>
>> osb->vol_label = kmalloc(OCFS2_MAX_VOL_LABEL_LEN, GFP_KERNEL);
>> if (!osb->vol_label) {
>
More information about the Ocfs2-devel
mailing list