Accepting request 492763 from home:ZRen:branches:Base:System
- This patch has been dropped since SLE12 (bsc#952300) * removed sys_mount_instead_linux_fs.diff - Drop obsolete patches: * removed improve_probing.diff (bsc#49657) * removed no-inc-audit.diff * removed suppress_format1_size_warning.diff - Add more bug/fate references, and reorder the patches accordingly - This patch has been dropped since SLE12 (bsc#952300) * removed sys_mount_instead_linux_fs.diff - Drop obsolete patches: * removed improve_probing.diff (bsc#49657) * removed no-inc-audit.diff * removed suppress_format1_size_warning.diff - Add more bug/fate references, and reorder the patches accordingly - This patch has been dropped since SLE12 (bsc#952300) * removed sys_mount_instead_linux_fs.diff - Drop obsolete patches: * removed improve_probing.diff (bsc#49657) * removed no-inc-audit.diff * removed suppress_format1_size_warning.diff - Add more bug/fate references, and reorder the patches accordingly OBS-URL: https://build.opensuse.org/request/show/492763 OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=182
This commit is contained in:
Eric ren
Git OBS Bridge
parent
c98d894a7b
commit
40b70d82b5
@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed May 3 09:01:42 UTC 2017 - zren@suse.com
|
||||||
|
|
||||||
|
- This patch has been dropped since SLE12 (bsc#952300)
|
||||||
|
* removed sys_mount_instead_linux_fs.diff
|
||||||
|
- Drop obsolete patches:
|
||||||
|
* removed improve_probing.diff (bsc#49657)
|
||||||
|
* removed no-inc-audit.diff
|
||||||
|
* removed suppress_format1_size_warning.diff
|
||||||
|
- Add more bug/fate references, and reorder the patches accordingly
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Apr 25 12:00:23 UTC 2017 - zren@suse.com
|
Tue Apr 25 12:00:23 UTC 2017 - zren@suse.com
|
||||||
|
|
||||||
|
|||||||
@ -48,37 +48,37 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|||||||
### COMMON-PATCH-BEGIN ###
|
### COMMON-PATCH-BEGIN ###
|
||||||
# Upstream patches
|
# Upstream patches
|
||||||
# SUSE patches: 1000+ for LVM, 2000+ for device mapper
|
# SUSE patches: 1000+ for LVM, 2000+ for device mapper
|
||||||
Patch1001: improve_probing.diff
|
|
||||||
Patch1002: no-inc-audit.diff
|
|
||||||
#bsc#952300
|
|
||||||
Patch1004: sys_mount_instead_linux_fs.diff
|
|
||||||
Patch1005: display-dm-name-for-lv-name.diff
|
|
||||||
Patch1006: device-mapper-type_punning.diff
|
|
||||||
#fate312248, patch7,8
|
|
||||||
Patch1007: make-mirror-legs-on-different-tag-pvs.patch
|
|
||||||
Patch1008: improve-mirror-legs-on-different-tag-pvs.patch
|
|
||||||
#fate#315092
|
|
||||||
Patch1009: cmirrord_improvment_performance.patch
|
|
||||||
#fate#314367, patch10,11
|
|
||||||
Patch1010: cluster_support_mirrord_log.diff
|
|
||||||
Patch1011: lvconvert-cluster-mirrored-disk-failed.patch
|
|
||||||
#forward-port from sle11
|
|
||||||
Patch1012: suppress_format1_size_warning.diff
|
|
||||||
Patch1013: pvmove_support_clustered_vg.diff
|
|
||||||
# Never upstream
|
# Never upstream
|
||||||
Patch1014: cmirrord_remove_date_time_from_compilation.patch
|
Patch1001: cmirrord_remove_date_time_from_compilation.patch
|
||||||
|
#fate#309425
|
||||||
|
Patch1002: display-dm-name-for-lv-name.diff
|
||||||
|
# no reference
|
||||||
|
Patch1003: device-mapper-type_punning.diff
|
||||||
|
#fate#312248
|
||||||
|
Patch1004: make-mirror-legs-on-different-tag-pvs.patch
|
||||||
|
Patch1005: improve-mirror-legs-on-different-tag-pvs.patch
|
||||||
|
#fate#315092
|
||||||
|
Patch1006: cmirrord_improvment_performance.patch
|
||||||
|
#fate#314367
|
||||||
|
Patch1007: cluster_support_mirrord_log.diff
|
||||||
|
Patch1008: lvconvert-cluster-mirrored-disk-failed.patch
|
||||||
|
# no reference
|
||||||
|
Patch1009: pvmove_support_clustered_vg.diff
|
||||||
#bnc873538
|
#bnc873538
|
||||||
Patch1015: fix-closedown-before-thread-finish.patch
|
Patch1010: fix-closedown-before-thread-finish.patch
|
||||||
#bnc#870824
|
#bnc#870824
|
||||||
Patch1016: use-mirrortype-asdefault-whenclvmdrunning.patch
|
Patch1011: use-mirrortype-asdefault-whenclvmdrunning.patch
|
||||||
Patch1017: version-plugins-in-libdir.patch
|
# no reference
|
||||||
|
Patch1012: version-plugins-in-libdir.patch
|
||||||
#bsc#935623
|
#bsc#935623
|
||||||
Patch1018: dmeventd-fix-dso-name-wrong-compare.patch
|
Patch1013: dmeventd-fix-dso-name-wrong-compare.patch
|
||||||
#bsc#960044
|
#bsc#960044
|
||||||
Patch1019: lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch
|
Patch1014: lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch
|
||||||
#bsc#479104,bnc#707253
|
#bsc#479104,bnc#707253
|
||||||
Patch2000: device-mapper-dmsetup-export.patch
|
Patch2000: device-mapper-dmsetup-export.patch
|
||||||
|
# no reference
|
||||||
Patch2001: device-mapper-gcc-warnings.patch
|
Patch2001: device-mapper-gcc-warnings.patch
|
||||||
|
#bsc#724578
|
||||||
Patch2002: device-mapper-link.patch
|
Patch2002: device-mapper-link.patch
|
||||||
#bnc#78902,bnc#789019,bnc#789020
|
#bnc#78902,bnc#789019,bnc#789020
|
||||||
Patch2003: udev_rules-update.diff
|
Patch2003: udev_rules-update.diff
|
||||||
@ -110,6 +110,7 @@ Programs and man pages for configuring and using the device mapper.
|
|||||||
### COMMON-PREP-BEGIN ###
|
### COMMON-PREP-BEGIN ###
|
||||||
%patch1001 -p1
|
%patch1001 -p1
|
||||||
%patch1002 -p1
|
%patch1002 -p1
|
||||||
|
%patch1003 -p1
|
||||||
%patch1004 -p1
|
%patch1004 -p1
|
||||||
%patch1005 -p1
|
%patch1005 -p1
|
||||||
%patch1006 -p1
|
%patch1006 -p1
|
||||||
@ -121,11 +122,6 @@ Programs and man pages for configuring and using the device mapper.
|
|||||||
%patch1012 -p1
|
%patch1012 -p1
|
||||||
%patch1013 -p1
|
%patch1013 -p1
|
||||||
%patch1014 -p1
|
%patch1014 -p1
|
||||||
%patch1015 -p1
|
|
||||||
%patch1016 -p1
|
|
||||||
%patch1017 -p1
|
|
||||||
%patch1018 -p1
|
|
||||||
%patch1019 -p1
|
|
||||||
%patch2000 -p1
|
%patch2000 -p1
|
||||||
%patch2001 -p1
|
%patch2001 -p1
|
||||||
%patch2002 -p1
|
%patch2002 -p1
|
||||||
|
|||||||
@ -1,30 +0,0 @@
|
|||||||
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
|
|
||||||
@@ -12,6 +12,11 @@
|
|
||||||
* along with this program; if not, write to the Free Software Foundation,
|
|
||||||
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
|
||||||
+#include <sys/ioctl.h>
|
|
||||||
+#include <linux/fs.h>
|
|
||||||
+#undef MAJOR
|
|
||||||
+#undef MINOR
|
|
||||||
+#undef MKDEV
|
|
||||||
|
|
||||||
#include "lib.h"
|
|
||||||
#include "filter.h"
|
|
||||||
@@ -28,6 +33,13 @@ static int _passes_lvm_type_device_filte
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ /* Skip cdrom device */
|
|
||||||
+ #define CDROM_GET_CAPABILITY 0x5331
|
|
||||||
+ if (ioctl(dev->fd, CDROM_GET_CAPABILITY) >= 0) {
|
|
||||||
+ log_debug_devs("%s: Skipping: cdrom device", name );
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed May 3 09:01:42 UTC 2017 - zren@suse.com
|
||||||
|
|
||||||
|
- This patch has been dropped since SLE12 (bsc#952300)
|
||||||
|
* removed sys_mount_instead_linux_fs.diff
|
||||||
|
- Drop obsolete patches:
|
||||||
|
* removed improve_probing.diff (bsc#49657)
|
||||||
|
* removed no-inc-audit.diff
|
||||||
|
* removed suppress_format1_size_warning.diff
|
||||||
|
- Add more bug/fate references, and reorder the patches accordingly
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Apr 25 12:00:23 UTC 2017 - zren@suse.com
|
Tue Apr 25 12:00:23 UTC 2017 - zren@suse.com
|
||||||
|
|
||||||
|
|||||||
@ -51,37 +51,37 @@ Provides: cmirrord = %{version}
|
|||||||
### COMMON-PATCH-BEGIN ###
|
### COMMON-PATCH-BEGIN ###
|
||||||
# Upstream patches
|
# Upstream patches
|
||||||
# SUSE patches: 1000+ for LVM, 2000+ for device mapper
|
# SUSE patches: 1000+ for LVM, 2000+ for device mapper
|
||||||
Patch1001: improve_probing.diff
|
|
||||||
Patch1002: no-inc-audit.diff
|
|
||||||
#bsc#952300
|
|
||||||
Patch1004: sys_mount_instead_linux_fs.diff
|
|
||||||
Patch1005: display-dm-name-for-lv-name.diff
|
|
||||||
Patch1006: device-mapper-type_punning.diff
|
|
||||||
#fate312248, patch7,8
|
|
||||||
Patch1007: make-mirror-legs-on-different-tag-pvs.patch
|
|
||||||
Patch1008: improve-mirror-legs-on-different-tag-pvs.patch
|
|
||||||
#fate#315092
|
|
||||||
Patch1009: cmirrord_improvment_performance.patch
|
|
||||||
#fate#314367, patch10,11
|
|
||||||
Patch1010: cluster_support_mirrord_log.diff
|
|
||||||
Patch1011: lvconvert-cluster-mirrored-disk-failed.patch
|
|
||||||
#forward-port from sle11
|
|
||||||
Patch1012: suppress_format1_size_warning.diff
|
|
||||||
Patch1013: pvmove_support_clustered_vg.diff
|
|
||||||
# Never upstream
|
# Never upstream
|
||||||
Patch1014: cmirrord_remove_date_time_from_compilation.patch
|
Patch1001: cmirrord_remove_date_time_from_compilation.patch
|
||||||
|
#fate#309425
|
||||||
|
Patch1002: display-dm-name-for-lv-name.diff
|
||||||
|
# no reference
|
||||||
|
Patch1003: device-mapper-type_punning.diff
|
||||||
|
#fate#312248
|
||||||
|
Patch1004: make-mirror-legs-on-different-tag-pvs.patch
|
||||||
|
Patch1005: improve-mirror-legs-on-different-tag-pvs.patch
|
||||||
|
#fate#315092
|
||||||
|
Patch1006: cmirrord_improvment_performance.patch
|
||||||
|
#fate#314367
|
||||||
|
Patch1007: cluster_support_mirrord_log.diff
|
||||||
|
Patch1008: lvconvert-cluster-mirrored-disk-failed.patch
|
||||||
|
# no reference
|
||||||
|
Patch1009: pvmove_support_clustered_vg.diff
|
||||||
#bnc873538
|
#bnc873538
|
||||||
Patch1015: fix-closedown-before-thread-finish.patch
|
Patch1010: fix-closedown-before-thread-finish.patch
|
||||||
#bnc#870824
|
#bnc#870824
|
||||||
Patch1016: use-mirrortype-asdefault-whenclvmdrunning.patch
|
Patch1011: use-mirrortype-asdefault-whenclvmdrunning.patch
|
||||||
Patch1017: version-plugins-in-libdir.patch
|
# no reference
|
||||||
|
Patch1012: version-plugins-in-libdir.patch
|
||||||
#bsc#935623
|
#bsc#935623
|
||||||
Patch1018: dmeventd-fix-dso-name-wrong-compare.patch
|
Patch1013: dmeventd-fix-dso-name-wrong-compare.patch
|
||||||
#bsc#960044
|
#bsc#960044
|
||||||
Patch1019: lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch
|
Patch1014: lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch
|
||||||
#bsc#479104,bnc#707253
|
#bsc#479104,bnc#707253
|
||||||
Patch2000: device-mapper-dmsetup-export.patch
|
Patch2000: device-mapper-dmsetup-export.patch
|
||||||
|
# no reference
|
||||||
Patch2001: device-mapper-gcc-warnings.patch
|
Patch2001: device-mapper-gcc-warnings.patch
|
||||||
|
#bsc#724578
|
||||||
Patch2002: device-mapper-link.patch
|
Patch2002: device-mapper-link.patch
|
||||||
#bnc#78902,bnc#789019,bnc#789020
|
#bnc#78902,bnc#789019,bnc#789020
|
||||||
Patch2003: udev_rules-update.diff
|
Patch2003: udev_rules-update.diff
|
||||||
@ -114,6 +114,7 @@ A daemon for using LVM2 Logival Volumes in a clustered environment.
|
|||||||
### COMMON-PREP-BEGIN ###
|
### COMMON-PREP-BEGIN ###
|
||||||
%patch1001 -p1
|
%patch1001 -p1
|
||||||
%patch1002 -p1
|
%patch1002 -p1
|
||||||
|
%patch1003 -p1
|
||||||
%patch1004 -p1
|
%patch1004 -p1
|
||||||
%patch1005 -p1
|
%patch1005 -p1
|
||||||
%patch1006 -p1
|
%patch1006 -p1
|
||||||
@ -125,11 +126,6 @@ A daemon for using LVM2 Logival Volumes in a clustered environment.
|
|||||||
%patch1012 -p1
|
%patch1012 -p1
|
||||||
%patch1013 -p1
|
%patch1013 -p1
|
||||||
%patch1014 -p1
|
%patch1014 -p1
|
||||||
%patch1015 -p1
|
|
||||||
%patch1016 -p1
|
|
||||||
%patch1017 -p1
|
|
||||||
%patch1018 -p1
|
|
||||||
%patch1019 -p1
|
|
||||||
%patch2000 -p1
|
%patch2000 -p1
|
||||||
%patch2001 -p1
|
%patch2001 -p1
|
||||||
%patch2002 -p1
|
%patch2002 -p1
|
||||||
|
|||||||
11
lvm2.changes
11
lvm2.changes
@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed May 3 09:01:42 UTC 2017 - zren@suse.com
|
||||||
|
|
||||||
|
- This patch has been dropped since SLE12 (bsc#952300)
|
||||||
|
* removed sys_mount_instead_linux_fs.diff
|
||||||
|
- Drop obsolete patches:
|
||||||
|
* removed improve_probing.diff (bsc#49657)
|
||||||
|
* removed no-inc-audit.diff
|
||||||
|
* removed suppress_format1_size_warning.diff
|
||||||
|
- Add more bug/fate references, and reorder the patches accordingly
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Apr 25 12:00:23 UTC 2017 - zren@suse.com
|
Tue Apr 25 12:00:23 UTC 2017 - zren@suse.com
|
||||||
|
|
||||||
|
|||||||
52
lvm2.spec
52
lvm2.spec
@ -56,37 +56,37 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|||||||
### COMMON-PATCH-BEGIN ###
|
### COMMON-PATCH-BEGIN ###
|
||||||
# Upstream patches
|
# Upstream patches
|
||||||
# SUSE patches: 1000+ for LVM, 2000+ for device mapper
|
# SUSE patches: 1000+ for LVM, 2000+ for device mapper
|
||||||
Patch1001: improve_probing.diff
|
|
||||||
Patch1002: no-inc-audit.diff
|
|
||||||
#bsc#952300
|
|
||||||
Patch1004: sys_mount_instead_linux_fs.diff
|
|
||||||
Patch1005: display-dm-name-for-lv-name.diff
|
|
||||||
Patch1006: device-mapper-type_punning.diff
|
|
||||||
#fate312248, patch7,8
|
|
||||||
Patch1007: make-mirror-legs-on-different-tag-pvs.patch
|
|
||||||
Patch1008: improve-mirror-legs-on-different-tag-pvs.patch
|
|
||||||
#fate#315092
|
|
||||||
Patch1009: cmirrord_improvment_performance.patch
|
|
||||||
#fate#314367, patch10,11
|
|
||||||
Patch1010: cluster_support_mirrord_log.diff
|
|
||||||
Patch1011: lvconvert-cluster-mirrored-disk-failed.patch
|
|
||||||
#forward-port from sle11
|
|
||||||
Patch1012: suppress_format1_size_warning.diff
|
|
||||||
Patch1013: pvmove_support_clustered_vg.diff
|
|
||||||
# Never upstream
|
# Never upstream
|
||||||
Patch1014: cmirrord_remove_date_time_from_compilation.patch
|
Patch1001: cmirrord_remove_date_time_from_compilation.patch
|
||||||
|
#fate#309425
|
||||||
|
Patch1002: display-dm-name-for-lv-name.diff
|
||||||
|
# no reference
|
||||||
|
Patch1003: device-mapper-type_punning.diff
|
||||||
|
#fate#312248
|
||||||
|
Patch1004: make-mirror-legs-on-different-tag-pvs.patch
|
||||||
|
Patch1005: improve-mirror-legs-on-different-tag-pvs.patch
|
||||||
|
#fate#315092
|
||||||
|
Patch1006: cmirrord_improvment_performance.patch
|
||||||
|
#fate#314367
|
||||||
|
Patch1007: cluster_support_mirrord_log.diff
|
||||||
|
Patch1008: lvconvert-cluster-mirrored-disk-failed.patch
|
||||||
|
# no reference
|
||||||
|
Patch1009: pvmove_support_clustered_vg.diff
|
||||||
#bnc873538
|
#bnc873538
|
||||||
Patch1015: fix-closedown-before-thread-finish.patch
|
Patch1010: fix-closedown-before-thread-finish.patch
|
||||||
#bnc#870824
|
#bnc#870824
|
||||||
Patch1016: use-mirrortype-asdefault-whenclvmdrunning.patch
|
Patch1011: use-mirrortype-asdefault-whenclvmdrunning.patch
|
||||||
Patch1017: version-plugins-in-libdir.patch
|
# no reference
|
||||||
|
Patch1012: version-plugins-in-libdir.patch
|
||||||
#bsc#935623
|
#bsc#935623
|
||||||
Patch1018: dmeventd-fix-dso-name-wrong-compare.patch
|
Patch1013: dmeventd-fix-dso-name-wrong-compare.patch
|
||||||
#bsc#960044
|
#bsc#960044
|
||||||
Patch1019: lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch
|
Patch1014: lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch
|
||||||
#bsc#479104,bnc#707253
|
#bsc#479104,bnc#707253
|
||||||
Patch2000: device-mapper-dmsetup-export.patch
|
Patch2000: device-mapper-dmsetup-export.patch
|
||||||
|
# no reference
|
||||||
Patch2001: device-mapper-gcc-warnings.patch
|
Patch2001: device-mapper-gcc-warnings.patch
|
||||||
|
#bsc#724578
|
||||||
Patch2002: device-mapper-link.patch
|
Patch2002: device-mapper-link.patch
|
||||||
#bnc#78902,bnc#789019,bnc#789020
|
#bnc#78902,bnc#789019,bnc#789020
|
||||||
Patch2003: udev_rules-update.diff
|
Patch2003: udev_rules-update.diff
|
||||||
@ -119,6 +119,7 @@ Volume Manager.
|
|||||||
### COMMON-PREP-BEGIN ###
|
### COMMON-PREP-BEGIN ###
|
||||||
%patch1001 -p1
|
%patch1001 -p1
|
||||||
%patch1002 -p1
|
%patch1002 -p1
|
||||||
|
%patch1003 -p1
|
||||||
%patch1004 -p1
|
%patch1004 -p1
|
||||||
%patch1005 -p1
|
%patch1005 -p1
|
||||||
%patch1006 -p1
|
%patch1006 -p1
|
||||||
@ -130,11 +131,6 @@ Volume Manager.
|
|||||||
%patch1012 -p1
|
%patch1012 -p1
|
||||||
%patch1013 -p1
|
%patch1013 -p1
|
||||||
%patch1014 -p1
|
%patch1014 -p1
|
||||||
%patch1015 -p1
|
|
||||||
%patch1016 -p1
|
|
||||||
%patch1017 -p1
|
|
||||||
%patch1018 -p1
|
|
||||||
%patch1019 -p1
|
|
||||||
%patch2000 -p1
|
%patch2000 -p1
|
||||||
%patch2001 -p1
|
%patch2001 -p1
|
||||||
%patch2002 -p1
|
%patch2002 -p1
|
||||||
|
|||||||
@ -1,24 +0,0 @@
|
|||||||
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
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
---
|
|
||||||
lib/format1/import-export.c | 2 +-
|
|
||||||
lib/format_text/import_vsn1.c | 2 +-
|
|
||||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
--- LVM2.2.02.98.orig/lib/format1/import-export.c
|
|
||||||
+++ LVM2.2.02.98/lib/format1/import-export.c
|
|
||||||
@@ -104,7 +104,7 @@ int import_pv(const struct format_type *
|
|
||||||
log_error("%s: Couldn't get size.", pv_dev_name(pv));
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
- log_verbose("Fixing up missing format1 size (%s) "
|
|
||||||
+ log_debug("Fixing up missing format1 size (%s) "
|
|
||||||
"for PV %s", display_size(fmt->cmd, pv->size),
|
|
||||||
pv_dev_name(pv));
|
|
||||||
if (vg) {
|
|
||||||
--- LVM2.2.02.98.orig/lib/format_text/import_vsn1.c
|
|
||||||
+++ LVM2.2.02.98/lib/format_text/import_vsn1.c
|
|
||||||
@@ -262,7 +262,7 @@ static int _read_pv(struct format_instan
|
|
||||||
log_error("%s: Couldn't get size.", pv_dev_name(pv));
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
- log_verbose("Fixing up missing size (%s) "
|
|
||||||
+ log_debug("Fixing up missing size (%s) "
|
|
||||||
"for PV %s", display_size(fid->fmt->cmd, pv->size),
|
|
||||||
pv_dev_name(pv));
|
|
||||||
size = pv->pe_count * (uint64_t) vg->extent_size + pv->pe_start;
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
Index: LVM2.2.02.111/lib/device/dev-io.c
|
|
||||||
===================================================================
|
|
||||||
--- LVM2.2.02.111.orig/lib/device/dev-io.c
|
|
||||||
+++ LVM2.2.02.111/lib/device/dev-io.c
|
|
||||||
@@ -31,7 +31,7 @@
|
|
||||||
# undef WNOHANG /* Avoid redefinition */
|
|
||||||
# undef WUNTRACED /* Avoid redefinition */
|
|
||||||
# define _LINUX_AUDIT_H_ /* Avoid inclusion */
|
|
||||||
-# include <linux/fs.h> /* For block ioctl definitions */
|
|
||||||
+# include <sys/mount.h> /* For block ioctl definitions */
|
|
||||||
# define BLKSIZE_SHIFT SECTOR_SHIFT
|
|
||||||
# ifndef BLKGETSIZE64 /* fs.h out-of-date */
|
|
||||||
# define BLKGETSIZE64 _IOR(0x12, 114, size_t)
|
|
||||||
Index: LVM2.2.02.111/lib/filters/filter-type.c
|
|
||||||
===================================================================
|
|
||||||
--- LVM2.2.02.111.orig/lib/filters/filter-type.c
|
|
||||||
+++ LVM2.2.02.111/lib/filters/filter-type.c
|
|
||||||
@@ -14,7 +14,7 @@
|
|
||||||
*/
|
|
||||||
#include <sys/ioctl.h>
|
|
||||||
#define _LINUX_AUDIT_H_
|
|
||||||
-#include <linux/fs.h>
|
|
||||||
+#include <sys/mount.h>
|
|
||||||
#undef MAJOR
|
|
||||||
#undef MINOR
|
|
||||||
#undef MKDEV
|
|
||||||
Loading…
Reference in New Issue
Block a user