From: Michael Paquier Date: Mon, 1 Aug 2022 07:39:33 +0000 (+0900) Subject: Fix error reporting after ioctl() call with pg_upgrade --clone X-Git-Tag: REL_12_12~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=24872bbf9288d8949b3f2ed60c0f3ef12015016f;p=thirdparty%2Fpostgresql.git Fix error reporting after ioctl() call with pg_upgrade --clone errno was not reported correctly after attempting to clone a file, leading to incorrect error reports. While scanning through the code, I have not noticed any similar mistakes. Error introduced in 3a769d8. Author: Justin Pryzby Discussion: https://postgr.es/m/20220731134135.GY15006@telsasoft.com Backpatch-through: 12 --- diff --git a/src/bin/pg_upgrade/file.c b/src/bin/pg_upgrade/file.c index c7fed24df93..76d18e9f094 100644 --- a/src/bin/pg_upgrade/file.c +++ b/src/bin/pg_upgrade/file.c @@ -62,9 +62,11 @@ cloneFile(const char *src, const char *dst, if (ioctl(dest_fd, FICLONE, src_fd) < 0) { + int save_errno = errno; + unlink(dst); pg_fatal("error while cloning relation \"%s.%s\" (\"%s\" to \"%s\"): %s\n", - schemaName, relName, src, dst, strerror(errno)); + schemaName, relName, src, dst, strerror(save_errno)); } close(src_fd);