rpms/xfsdump
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix xfsrestore-untangle-inventory-unpacking-logic patch

Browse Source 
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 <ddouwsma@redhat.com>
This commit is contained in:
Donald Douwsma 2025-12-10 17:06:21 +11:00
parent 892c094d4b
commit 8aabb69fe5
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
0008-v3.1.12-xfsrestore-untangle-inventory-unpacking-logic.patch
View File

@ -15,14 +15,12 @@ Signed-off-by: Pavel Reichl <preichl@redhat.com>
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