e5eddaae1a
Update to the head of the upstream staging branch Rename redhat patches * Previous patches 0001-0012 are now patches 0041-0052 Add 0053-RH-Add-mpathcleanup.patch * add mpathcleanup program
62 lines
2.2 KiB
Diff
62 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Thu, 24 Aug 2023 15:53:49 +0200
|
|
Subject: [PATCH] libmultipath: update_bindings_file: take filename argument
|
|
|
|
This function just uses the file name, no other configuration
|
|
parameters. Also, pass the Bindings argument first to use the
|
|
same convention as the other functions in this file.
|
|
|
|
Signed-off-by: Martin Wilck <mwilck@suse.com>
|
|
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmultipath/alias.c | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/libmultipath/alias.c b/libmultipath/alias.c
|
|
index 7af403da..9bd3875e 100644
|
|
--- a/libmultipath/alias.c
|
|
+++ b/libmultipath/alias.c
|
|
@@ -138,15 +138,15 @@ static int write_bindings_file(const Bindings *bindings, int fd)
|
|
return 0;
|
|
}
|
|
|
|
-static int update_bindings_file(const struct config *conf,
|
|
- const Bindings *bindings)
|
|
+static int update_bindings_file(const Bindings *bindings,
|
|
+ const char *bindings_file)
|
|
{
|
|
int rc;
|
|
int fd = -1;
|
|
char tempname[PATH_MAX];
|
|
mode_t old_umask;
|
|
|
|
- if (safe_sprintf(tempname, "%s.XXXXXX", conf->bindings_file))
|
|
+ if (safe_sprintf(tempname, "%s.XXXXXX", bindings_file))
|
|
return -1;
|
|
/* coverity: SECURE_TEMP */
|
|
old_umask = umask(0077);
|
|
@@ -164,10 +164,10 @@ static int update_bindings_file(const struct config *conf,
|
|
unlink(tempname);
|
|
return rc;
|
|
}
|
|
- if ((rc = rename(tempname, conf->bindings_file)) == -1)
|
|
+ if ((rc = rename(tempname, bindings_file)) == -1)
|
|
condlog(0, "%s: rename: %m", __func__);
|
|
else
|
|
- condlog(1, "updated bindings file %s", conf->bindings_file);
|
|
+ condlog(1, "updated bindings file %s", bindings_file);
|
|
return rc;
|
|
}
|
|
|
|
@@ -767,7 +767,7 @@ int check_alias_settings(const struct config *conf)
|
|
rc = _check_bindings_file(conf, file, &bindings);
|
|
pthread_cleanup_pop(1);
|
|
if (rc == -1 && can_write && !conf->bindings_read_only)
|
|
- rc = update_bindings_file(conf, &bindings);
|
|
+ rc = update_bindings_file(&bindings, conf->bindings_file);
|
|
else if (rc == -1)
|
|
condlog(0, "ERROR: bad settings in read-only bindings file %s",
|
|
conf->bindings_file);
|