From 8aabb69fe531c5eb07e5aa849c805b7b71b76b8d Mon Sep 17 00:00:00 2001 From: Donald Douwsma Date: Wed, 10 Dec 2025 17:06:21 +1100 Subject: [PATCH] Fix xfsrestore-untangle-inventory-unpacking-logic patch In the move to c8s the patch series was rebased and the initialization of sessp got dropped. $ git diff rhel-8.8.0:0003-v3.1.12-xfsrestore-untangle-inventory-unpacking-logic.patch \ rhel-8.9.0:0008-v3.1.12-xfsrestore-untangle-inventory-unpacking-logic.patch | grep sessp - sessp = 0; +- sessp = 0; if ( ! ok || ! sessp ) { Regenerate the patch to fix this. Resolves: RHEL-179062 Signed-off-by: Donald Douwsma --- ...tore-untangle-inventory-unpacking-logic.patch | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/0008-v3.1.12-xfsrestore-untangle-inventory-unpacking-logic.patch b/0008-v3.1.12-xfsrestore-untangle-inventory-unpacking-logic.patch index 8f33d9b..0002a9c 100644 --- a/0008-v3.1.12-xfsrestore-untangle-inventory-unpacking-logic.patch +++ b/0008-v3.1.12-xfsrestore-untangle-inventory-unpacking-logic.patch @@ -15,14 +15,12 @@ Signed-off-by: Pavel Reichl 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/restore/content.c b/restore/content.c -index b19bb90..8bb5fa4 100644 --- a/restore/content.c +++ b/restore/content.c -@@ -5467,18 +5467,14 @@ - /* ask inventory to convert buffer into session +@@ -5468,19 +5468,16 @@ pi_addfile( Media_t *Mediap, * desc. */ -- sessp = 0; + sessp = 0; - if ( ! buflen ) { - ok = BOOL_FALSE; - } else { @@ -38,10 +36,14 @@ index b19bb90..8bb5fa4 100644 ok = BOOL_TRUE; - } } +- if ( ! ok || ! sessp ) { +- mlog( MLOG_DEBUG | MLOG_WARNING | MLOG_MEDIA, _( + - if ( ! ok || ! sessp ) { - mlog( MLOG_DEBUG | MLOG_WARNING | MLOG_MEDIA, _( ++ if (!ok || !sessp) { ++ mlog(MLOG_DEBUG | MLOG_WARNING | MLOG_MEDIA, _( "on-media session " + "inventory corrupt\n") ); + } else { -- -2.41.0 +2.47.3