mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-25 14:48:25 +03:00
zfs + zfs_git: 0.6.5 -> 0.6.5.1
This commit is contained in:
parent
c25677d95a
commit
d9fd037e88
@ -1,28 +0,0 @@
|
||||
From 96165264ad0afe7a5d440ef49f9712a188486266 Mon Sep 17 00:00:00 2001
|
||||
From: Richard Yao <ryao@gentoo.org>
|
||||
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 <richard.connon@zynstra.com>
|
||||
Signed-off-by: Richard Yao <ryao@gentoo.org>
|
||||
---
|
||||
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
|
||||
|
@ -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 ];
|
||||
})
|
||||
|
@ -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;
|
||||
})
|
||||
|
Loading…
Reference in New Issue
Block a user