merge: block: zeroinit: request child permissions

diff --git a/debian/patches/pve/0049-block-zeroinit-request-child-permissions.patch b/debian/patches/pve/0049-block-zeroinit-request-child-permissions.patch
new file mode 100644 (file)
index 0000000..2285706
--- /dev/null
+++ b/debian/patches/pve/0049-block-zeroinit-request-child-permissions.patch
@@ -0,0 +1,25 @@
+From 5445b96892a6350894ea3785f174157c4e7bbbaa Mon Sep 17 00:00:00 2001
+From: Wolfgang Bumiller <w.bumiller@proxmox.com>
+Date: Fri, 31 Mar 2017 09:27:58 +0200
+Subject: [PATCH 49/49] block: zeroinit: request child permissions
+
+See d7010dfb685
+---
+ block/zeroinit.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/block/zeroinit.c b/block/zeroinit.c
+index 0a8c7f9..a857ec3 100644
+--- a/block/zeroinit.c
++++ b/block/zeroinit.c
+@@ -191,6 +191,7 @@ static BlockDriver bdrv_zeroinit = {
+     .bdrv_file_open                   = zeroinit_open,
+     .bdrv_close                       = zeroinit_close,
+     .bdrv_getlength                   = zeroinit_getlength,
++    .bdrv_child_perm                  = bdrv_filter_default_perms,
+     .bdrv_co_flush_to_disk            = zeroinit_co_flush,
+ 
+     .bdrv_co_pwrite_zeroes            = zeroinit_co_pwrite_zeroes,
+-- 
+2.1.4
+

diff --git a/debian/patches/series b/debian/patches/series
index 6a01378fb22f1db7f6ecdcf1cba6a1dba07d84a5..e6fe8a7b6e7a1ec114b40862e839236570fc9dec 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -46,3 +46,4 @@ pve/0045-qmp_delete_drive_snapshot-add-aiocontext.patch
 pve/0046-convert-savevm-async-to-threads.patch
 pve/0047-glusterfs-allow-partial-reads.patch
 pve/0048-vma-don-t-use-O_DIRECT-on-pipes.patch
 pve/0046-convert-savevm-async-to-threads.patch
 pve/0047-glusterfs-allow-partial-reads.patch
 pve/0048-vma-don-t-use-O_DIRECT-on-pipes.patch

+pve/0049-block-zeroinit-request-child-permissions.patch