From d9fd037e889ccfa1b9dd903ea7164fd11d3403f9 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 19 Sep 2015 15:02:59 -0700 Subject: zfs + zfs_git: 0.6.5 -> 0.6.5.1 --- .../linux/zfs/0.6.5-fix-corruption.patch | 28 ---------------------- pkgs/os-specific/linux/zfs/default.nix | 9 +++---- pkgs/os-specific/linux/zfs/git.nix | 11 ++++----- 3 files changed, 7 insertions(+), 41 deletions(-) delete mode 100644 pkgs/os-specific/linux/zfs/0.6.5-fix-corruption.patch (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/zfs/0.6.5-fix-corruption.patch b/pkgs/os-specific/linux/zfs/0.6.5-fix-corruption.patch deleted file mode 100644 index af4ce1333c84..000000000000 --- a/pkgs/os-specific/linux/zfs/0.6.5-fix-corruption.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 96165264ad0afe7a5d440ef49f9712a188486266 Mon Sep 17 00:00:00 2001 -From: Richard Yao -Date: Fri, 18 Sep 2015 08:32:52 -0400 -Subject: [PATCH] Discard on zvols should not exceed the length of a block - -37f9dac592bf5889c3efb305c48ac39b4c7dd140 replaced the end-start -calculation with a cached value, but neglected to update it on discard -operations. This can cause us to discard data not requested, causing -data loss on zvols. - -Reported-by: Richard Connon -Signed-off-by: Richard Yao ---- - module/zfs/zvol.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c -index 492f8ff..c5a8071 100644 ---- a/module/zfs/zvol.c -+++ b/module/zfs/zvol.c -@@ -661,6 +661,7 @@ zvol_discard(struct bio *bio) - if (!(bio->bi_rw & REQ_SECURE)) { - start = P2ROUNDUP(start, zv->zv_volblocksize); - end = P2ALIGN(end, zv->zv_volblocksize); -+ size = end - start; - } - #endif - diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index df74f1c76e20..1432fa3e79bb 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,17 +1,14 @@ { callPackage, fetchFromGitHub, ... } @ args: callPackage ./generic.nix (args // rec { - version = "0.6.5"; + version = "0.6.5.1"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "zfs"; rev = "zfs-${version}"; - sha256 = "1jqm2a9mldp4km5m454zszsw6p8hrqd7xrbf52pgp82kf5w3d6wz"; + sha256 = "0lbii5kc3b68zj8mvvznl05czwdkr0ld3a2javbkngfvrcn09rz2"; }; - patches = [ - ./nix-build.patch - ./0.6.5-fix-corruption.patch - ]; + patches = [ ./nix-build.patch ]; }) diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix index bf127301d2e3..0423d139c83c 100644 --- a/pkgs/os-specific/linux/zfs/git.nix +++ b/pkgs/os-specific/linux/zfs/git.nix @@ -1,19 +1,16 @@ { callPackage, stdenv, fetchFromGitHub, spl_git, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-09-11"; + version = "2015-09-19"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "zfs"; - rev = "7a27ad00ae142b38d4aef8cc0af7a72b4c0e44fe"; - sha256 = "1jqm2a9mldp4km5m454zszsw6p8hrqd7xrbf52pgp82kf5w3d6wz"; + rev = "3af56fd95fbe8b417d7ed7c9c25ef59d6f1ee161"; + sha256 = "08sx1jzwrsdyvvlcf5as7rkglgbx5x6zvfn8ps8gk4miqfckq4z0"; }; - patches = [ - ./nix-build.patch - ./0.6.5-fix-corruption.patch - ]; + patches = [ ./nix-build.patch ]; spl = spl_git; }) -- cgit 1.4.1