From: Greg Kroah-Hartman Date: Thu, 17 Sep 2020 15:12:10 +0000 (+0200) Subject: 4.19-stable patches X-Git-Tag: v4.4.237~51 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df4ffe7cb0f3a3fee591f93ac085f4b6e7e59694;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: gfs2-initialize-transaction-tr_ailx_lists-earlier.patch --- diff --git a/queue-4.19/gfs2-initialize-transaction-tr_ailx_lists-earlier.patch b/queue-4.19/gfs2-initialize-transaction-tr_ailx_lists-earlier.patch new file mode 100644 index 00000000000..cfe8dab69b2 --- /dev/null +++ b/queue-4.19/gfs2-initialize-transaction-tr_ailx_lists-earlier.patch @@ -0,0 +1,59 @@ +From cbcc89b630447ec7836aa2b9242d9bb1725f5a61 Mon Sep 17 00:00:00 2001 +From: Bob Peterson +Date: Fri, 5 Jun 2020 14:12:34 -0500 +Subject: gfs2: initialize transaction tr_ailX_lists earlier + +From: Bob Peterson + +commit cbcc89b630447ec7836aa2b9242d9bb1725f5a61 upstream. + +Since transactions may be freed shortly after they're created, before +a log_flush occurs, we need to initialize their ail1 and ail2 lists +earlier. Before this patch, the ail1 list was initialized in gfs2_log_flush(). +This moves the initialization to the point when the transaction is first +created. + +Signed-off-by: Bob Peterson +Signed-off-by: Andreas Gruenbacher +Cc: Salvatore Bonaccorso +Signed-off-by: Greg Kroah-Hartman + +--- + fs/gfs2/glops.c | 2 ++ + fs/gfs2/log.c | 2 -- + fs/gfs2/trans.c | 2 ++ + 3 files changed, 4 insertions(+), 2 deletions(-) + +--- a/fs/gfs2/glops.c ++++ b/fs/gfs2/glops.c +@@ -89,6 +89,8 @@ static void gfs2_ail_empty_gl(struct gfs + memset(&tr, 0, sizeof(tr)); + INIT_LIST_HEAD(&tr.tr_buf); + INIT_LIST_HEAD(&tr.tr_databuf); ++ INIT_LIST_HEAD(&tr.tr_ail1_list); ++ INIT_LIST_HEAD(&tr.tr_ail2_list); + tr.tr_revokes = atomic_read(&gl->gl_ail_count); + + if (!tr.tr_revokes) +--- a/fs/gfs2/log.c ++++ b/fs/gfs2/log.c +@@ -806,8 +806,6 @@ void gfs2_log_flush(struct gfs2_sbd *sdp + tr = sdp->sd_log_tr; + if (tr) { + sdp->sd_log_tr = NULL; +- INIT_LIST_HEAD(&tr->tr_ail1_list); +- INIT_LIST_HEAD(&tr->tr_ail2_list); + tr->tr_first = sdp->sd_log_flush_head; + if (unlikely (state == SFS_FROZEN)) + gfs2_assert_withdraw(sdp, !tr->tr_num_buf_new && !tr->tr_num_databuf_new); +--- a/fs/gfs2/trans.c ++++ b/fs/gfs2/trans.c +@@ -56,6 +56,8 @@ int gfs2_trans_begin(struct gfs2_sbd *sd + sizeof(u64)); + INIT_LIST_HEAD(&tr->tr_databuf); + INIT_LIST_HEAD(&tr->tr_buf); ++ INIT_LIST_HEAD(&tr->tr_ail1_list); ++ INIT_LIST_HEAD(&tr->tr_ail2_list); + + sb_start_intwrite(sdp->sd_vfs); + diff --git a/queue-4.19/series b/queue-4.19/series index fa17740383b..3839f3d7280 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -2,3 +2,4 @@ dsa-allow-forwarding-of-redirected-igmp-traffic.patch scsi-qla2xxx-update-rscn_rcvd-field-to-more-meaningful-scan_needed.patch scsi-qla2xxx-move-rport-registration-out-of-internal-work_list.patch scsi-qla2xxx-reduce-holding-sess_lock-to-prevent-cpu-lock-up.patch +gfs2-initialize-transaction-tr_ailx_lists-earlier.patch