Merge pull request #3593 from brauner/2020-12-07/bugfixes

2020 12 07/bugfixes

Merge pull request #3593 from brauner/2020-12-07/bugfixes
d1042c9d · Stéphane Graber · GitHub · 065d331a · abd833eb · d1042c9d
Unverified Commit d1042c9d authored Dec 07, 2020 by Stéphane Graber Committed by GitHub Dec 07, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

macro.h src/lxc/macro.h +4 -0

utils.h src/lxc/utils.h +0 -4

No files found.
--- a/src/lxc/macro.h
+++ b/src/lxc/macro.h
@@ -25,6 +25,10 @@
 #define PATH_MAX 4096
 #endif

+#ifndef MAX_GRBUF_SIZE
+#define MAX_GRBUF_SIZE 2097152
+#endif
+
 #define INT64_FMT "%" PRId64

 /* Define __S_ISTYPE if missing from the C library. */

--- a/src/lxc/utils.h
+++ b/src/lxc/utils.h
@@ -6,10 +6,6 @@
 /* Properly support loop devices on 32bit systems. */
 #define _FILE_OFFSET_BITS 64

-#ifndef MAX_GRBUF_SIZE
-#define MAX_GRBUF_SIZE 65536
-#endif
-
 #include <errno.h>
 #include <linux/loop.h>
 #include <linux/types.h>