lvm2: update to version 2.02.164

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle
2016-08-30 17:02:21 +02:00
parent 4944d6e1b5
commit 0d3a10e3b4
4 changed files with 10 additions and 26 deletions
+4 -15
View File
@@ -1,17 +1,6 @@
--- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
@@ -1785,8 +1785,10 @@ struct cmd_context *create_toolcontext(u
unsigned set_filters)
{
struct cmd_context *cmd;
+#if defined(__GLIBC__) && !defined(VALGRIND_POOL)
FILE *new_stream;
int flags;
+#endif
#ifdef M_MMAP_MAX
mallopt(M_MMAP_MAX, 0);
@@ -1822,7 +1824,7 @@ struct cmd_context *create_toolcontext(u
@@ -1843,7 +1843,7 @@ struct cmd_context *create_toolcontext(u
/* FIXME Make this configurable? */
reset_lvm_errno(1);
@@ -20,7 +9,7 @@
/* Set in/out stream buffering before glibc */
if (set_buffering) {
/* Allocate 2 buffers */
@@ -2205,7 +2207,7 @@ void destroy_toolcontext(struct cmd_cont
@@ -2224,7 +2224,7 @@ void destroy_toolcontext(struct cmd_cont
if (cmd->libmem)
dm_pool_destroy(cmd->libmem);
@@ -31,7 +20,7 @@
if (is_valid_fd(STDIN_FILENO) &&
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -1782,6 +1782,7 @@ int lvm_split(char *str, int *argc, char
@@ -1815,6 +1815,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)
{
@@ -39,7 +28,7 @@
int err = is_valid_fd(STDERR_FILENO);
if (!is_valid_fd(STDIN_FILENO) &&
@@ -1808,6 +1809,12 @@ static int _check_standard_fds(void)
@@ -1841,6 +1842,12 @@ static int _check_standard_fds(void)
strerror(errno));
return 0;
}