Andrew Morton
2022-May-10 04:17 UTC
[Ocfs2-devel] [merged mm-nonmm-stable] ocfs2-change-return-type-of-ocfs2_resmap_init.patch removed from -mm tree
The quilt patch titled Subject: ocfs2: change return type of ocfs2_resmap_init has been removed from the -mm tree. Its filename was ocfs2-change-return-type-of-ocfs2_resmap_init.patch This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Heming Zhao via Ocfs2-devel <ocfs2-devel at oss.oracle.com> Subject: ocfs2: change return type of ocfs2_resmap_init Since ocfs2_resmap_init() always return 0, change it to void. Link: https://lkml.kernel.org/r/20220424130952.2436-3-heming.zhao at suse.com Signed-off-by: Heming Zhao <heming.zhao at suse.com> Reviewed-by: Joseph Qi <joseph.qi at linux.alibaba.com> Cc: Changwei Ge <gechangwei at live.cn> Cc: Gang He <ghe at suse.com> Cc: Joel Becker <jlbec at evilplan.org> Cc: Jun Piao <piaojun at huawei.com> Cc: Junxiao Bi <junxiao.bi at oracle.com> Cc: Mark Fasheh <mark at fasheh.com> Signed-off-by: Andrew Morton <akpm at linux-foundation.org> --- fs/ocfs2/reservations.c | 4 +--- fs/ocfs2/reservations.h | 9 ++------- fs/ocfs2/super.c | 6 +----- 3 files changed, 4 insertions(+), 15 deletions(-) --- a/fs/ocfs2/reservations.c~ocfs2-change-return-type-of-ocfs2_resmap_init +++ a/fs/ocfs2/reservations.c @@ -198,7 +198,7 @@ void ocfs2_resv_set_type(struct ocfs2_al 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 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, --- a/fs/ocfs2/reservations.h~ocfs2-change-return-type-of-ocfs2_resmap_init +++ a/fs/ocfs2/reservations.h @@ -73,15 +73,10 @@ void ocfs2_resv_discard(struct ocfs2_res /** * ocfs2_resmap_init() - Initialize fields of a reservations bitmap + * @osb: struct ocfs2_super to be saved in resmap * @resmap: struct ocfs2_reservation_map to initialize - * @obj: unused for now - * @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. */ -int ocfs2_resmap_init(struct ocfs2_super *osb, +void ocfs2_resmap_init(struct ocfs2_super *osb, struct ocfs2_reservation_map *resmap); /** --- a/fs/ocfs2/super.c~ocfs2-change-return-type-of-ocfs2_resmap_init +++ a/fs/ocfs2/super.c @@ -2110,11 +2110,7 @@ static int ocfs2_initialize_super(struct 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) { _ Patches currently in -mm which might be from ocfs2-devel at oss.oracle.com are