32c4fd31de
update lvm2 & split thin-provisioning-tools &fix bsc#960044 OBS-URL: https://build.opensuse.org/request/show/356420 OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=145
25 lines
957 B
Diff
25 lines
957 B
Diff
Index: LVM2.2.02.141/lib/device/dev-io.c
|
|
===================================================================
|
|
--- LVM2.2.02.141.orig/lib/device/dev-io.c
|
|
+++ LVM2.2.02.141/lib/device/dev-io.c
|
|
@@ -30,6 +30,7 @@
|
|
# define u64 uint64_t /* Missing without __KERNEL__ */
|
|
# undef WNOHANG /* Avoid redefinition */
|
|
# undef WUNTRACED /* Avoid redefinition */
|
|
+# define _LINUX_AUDIT_H_ /* Avoid inclusion */
|
|
# include <linux/fs.h> /* For block ioctl definitions */
|
|
# define BLKSIZE_SHIFT SECTOR_SHIFT
|
|
# ifndef BLKGETSIZE64 /* fs.h out-of-date */
|
|
Index: LVM2.2.02.141/lib/filters/filter-type.c
|
|
===================================================================
|
|
--- LVM2.2.02.141.orig/lib/filters/filter-type.c
|
|
+++ LVM2.2.02.141/lib/filters/filter-type.c
|
|
@@ -13,6 +13,7 @@
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
#include <sys/ioctl.h>
|
|
+#define _LINUX_AUDIT_H_
|
|
#include <linux/fs.h>
|
|
#undef MAJOR
|
|
#undef MINOR
|