commit 4a672c87cd511dc5d305583a9b4f8f624bc510ee · pyrox.dev/nixpkgs

+28

pkgs/os-specific/linux/zfs/0.6.5-fix-corruption.patch

···

       1
       +
       From 96165264ad0afe7a5d440ef49f9712a188486266 Mon Sep 17 00:00:00 2001

     

       2
       +
       From: Richard Yao <ryao@gentoo.org>

     

       3
       +
       Date: Fri, 18 Sep 2015 08:32:52 -0400

     

       4
       +
       Subject: [PATCH] Discard on zvols should not exceed the length of a block

     

       5
       +
       

     

       6
       +
       37f9dac592bf5889c3efb305c48ac39b4c7dd140 replaced the end-start

     

       7
       +
       calculation with a cached value, but neglected to update it on discard

     

       8
       +
       operations. This can cause us to discard data not requested, causing

     

       9
       +
       data loss on zvols.

     

       10
       +
       

     

       11
       +
       Reported-by: Richard Connon <richard.connon@zynstra.com>

     

       12
       +
       Signed-off-by: Richard Yao <ryao@gentoo.org>

     

       13
       +
       ---

     

       14
       +
        module/zfs/zvol.c | 1 +

     

       15
       +
        1 file changed, 1 insertion(+)

     

       16
       +
       

     

       17
       +
       diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c

     

       18
       +
       index 492f8ff..c5a8071 100644

     

       19
       +
       --- a/module/zfs/zvol.c

     

       20
       +
       +++ b/module/zfs/zvol.c

     

       21
       +
       @@ -661,6 +661,7 @@ zvol_discard(struct bio *bio)

     

       22
       +
        	if (!(bio->bi_rw & REQ_SECURE)) {

     

       23
       +
        		start = P2ROUNDUP(start, zv->zv_volblocksize);

     

       24
       +
        		end = P2ALIGN(end, zv->zv_volblocksize);

     

       25
       +
       +		size = end - start;

     

       26
       +
        	}

     

       27
       +
        #endif

     

       28
       +

+4 -1

pkgs/os-specific/linux/zfs/default.nix

···

       10
        
           sha256 = "1jqm2a9mldp4km5m454zszsw6p8hrqd7xrbf52pgp82kf5w3d6wz";

     

       11
        
         };

     

       12
        
       

     

       13
       -
         patches = [ ./nix-build.patch ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       14
        
       })

···

       10
        
           sha256 = "1jqm2a9mldp4km5m454zszsw6p8hrqd7xrbf52pgp82kf5w3d6wz";

     

       11
        
         };

     

       12
        
       

     

       13
       +
         patches = [

     

       14
       +
           ./nix-build.patch

     

       15
       +
           ./0.6.5-fix-corruption.patch

     

       16
       +
         ];

     

       17
        
       })

+4 -1

pkgs/os-specific/linux/zfs/git.nix

···

       10
        
           sha256 = "1jqm2a9mldp4km5m454zszsw6p8hrqd7xrbf52pgp82kf5w3d6wz";

     

       11
        
         };

     

       12
        
       

     

       13
       -
         patches = [ ./nix-build.patch ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       14
        
       

     

       15
        
         spl = spl_git;

     

       16
        
       })

···

       10
        
           sha256 = "1jqm2a9mldp4km5m454zszsw6p8hrqd7xrbf52pgp82kf5w3d6wz";

     

       11
        
         };

     

       12
        
       

     

       13
       +
         patches = [

     

       14
       +
           ./nix-build.patch

     

       15
       +
           ./0.6.5-fix-corruption.patch

     

       16
       +
         ];

     

       17
        
       

     

       18
        
         spl = spl_git;

     

       19
        
       })