--- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
-@@ -1627,7 +1627,7 @@ struct cmd_context *create_toolcontext(u
+@@ -1677,7 +1677,7 @@ struct cmd_context *create_toolcontext(u
/* FIXME Make this configurable? */
reset_lvm_errno(1);
/* Set in/out stream buffering before glibc */
if (set_buffering
#ifdef SYS_gettid
-@@ -2014,7 +2014,7 @@ void destroy_toolcontext(struct cmd_cont
+@@ -2064,7 +2064,7 @@ void destroy_toolcontext(struct cmd_cont
if (cmd->pending_delete_mem)
dm_pool_destroy(cmd->pending_delete_mem);
if (is_valid_fd(STDIN_FILENO) &&
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
-@@ -3349,6 +3349,7 @@ int lvm_split(char *str, int *argc, char
+@@ -3381,6 +3381,7 @@ int lvm_split(char *str, int *argc, char
/* Make sure we have always valid filedescriptors 0,1,2 */
static int _check_standard_fds(void)
{
int err = is_valid_fd(STDERR_FILENO);
if (!is_valid_fd(STDIN_FILENO) &&
-@@ -3375,6 +3376,12 @@ static int _check_standard_fds(void)
+@@ -3407,6 +3408,12 @@ static int _check_standard_fds(void)
strerror(errno));
return 0;
}