diff options
| author | Ricardo M. Correia <rcorreia@wizy.org> | 2015-01-11 05:17:58 +0100 |
|---|---|---|
| committer | Ricardo M. Correia <rcorreia@wizy.org> | 2015-01-18 18:21:35 +0100 |
| commit | e0336a504ebb15177ea9ec5e82b683cbbf20e56f (patch) | |
| tree | 9cac7103ec813719fea16c756d53ce33abb15164 /pkgs | |
| parent | 58513cc380dd88de3ed8aea1323774696bbefeab (diff) | |
| download | nixpkgs-e0336a504ebb15177ea9ec5e82b683cbbf20e56f.tar nixpkgs-e0336a504ebb15177ea9ec5e82b683cbbf20e56f.tar.gz nixpkgs-e0336a504ebb15177ea9ec5e82b683cbbf20e56f.tar.bz2 nixpkgs-e0336a504ebb15177ea9ec5e82b683cbbf20e56f.tar.lz nixpkgs-e0336a504ebb15177ea9ec5e82b683cbbf20e56f.tar.xz nixpkgs-e0336a504ebb15177ea9ec5e82b683cbbf20e56f.tar.zst nixpkgs-e0336a504ebb15177ea9ec5e82b683cbbf20e56f.zip | |
spl: Fix mtime going backwards in time
Fixes #5652.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/spl/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/spl/time.patch | 18 |
2 files changed, 19 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 0648be4e41a..8f4a7491427 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0id0m3sfpkz8w7b2pc51px8kvz8xnaf8msps57ddarxidmxvb45g"; }; - patches = [ ./install_prefix.patch ./const.patch ]; + patches = [ ./install_prefix.patch ./const.patch ./time.patch ]; buildInputs = [ perl autoconf automake libtool ]; diff --git a/pkgs/os-specific/linux/spl/time.patch b/pkgs/os-specific/linux/spl/time.patch new file mode 100644 index 00000000000..6b1e23bc05e --- /dev/null +++ b/pkgs/os-specific/linux/spl/time.patch @@ -0,0 +1,18 @@ +diff --git a/module/spl/spl-time.c b/module/spl/spl-time.c +index 0ed49cc..b0fad4f 100644 +--- a/module/spl/spl-time.c ++++ b/module/spl/spl-time.c +@@ -40,12 +40,7 @@ extern unsigned long long monotonic_clock(void); + void + __gethrestime(timestruc_t *ts) + { +- struct timespec tspec; +- +- getnstimeofday(&tspec); +- +- ts->tv_sec = tspec.tv_sec; +- ts->tv_nsec = tspec.tv_nsec; ++ *ts = current_kernel_time(); + } + EXPORT_SYMBOL(__gethrestime); + |