btrfsprogs: 3.16 -> 3.16.1

pkgs/tools/filesystems/btrfsprogs/default.nix

@@ -1,14 +1,14 @@
 { stdenv, fetchurl, attr, acl, zlib, libuuid, e2fsprogs, lzo
 , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }:
 
-let version = "3.16"; in
+let version = "3.16.1"; in
 
 stdenv.mkDerivation rec {
   name = "btrfs-progs-${version}";
 
   src = fetchurl {
-    url = "mirror://kernel/linux/kernel/people/mason/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "0phbrgipl04q8cdj9nnshik7b6p2bg51jxb3l1gvfc04dkgm2xls";
+    url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
+    sha256 = "103ff31fn6x1r6y79hdzv5lqls68wqxmikwsl6q8mxllb5rqrwlk";
   };
 
   buildInputs = [
@@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
     asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt
   ];
 
-  patches = [ ./multiple_mounts.patch ];
-
   # for btrfs to get the rpath to libgcc_s, needed for pthread_cancel to work
   NIX_CFLAGS_LINK = "-lgcc_s";
 

pkgs/tools/filesystems/btrfsprogs/multiple_mounts.patch

@@ -1,13 +0,0 @@
-Only in btrfs-progs-v3.16-orig: btrfs-progs-v3.16
-diff -U3 -r btrfs-progs-v3.16-orig/utils.c btrfs-progs-v3.16/utils.c
---- btrfs-progs-v3.16-orig/utils.c	2014-09-03 09:57:45.644858545 +0400
-+++ btrfs-progs-v3.16/utils.c	2014-09-03 09:59:26.968855663 +0400
-@@ -2360,7 +2360,7 @@
- 		len = strlen(ent->mnt_dir);
- 		if (strncmp(ent->mnt_dir, path, len) == 0) {
- 			/* match found */
--			if (longest_matchlen < len) {
-+			if ((longest_matchlen < len) || (longest_matchlen==len && not_btrfs)) {
- 				free(longest_match);
- 				longest_matchlen = len;
- 				longest_match = strdup(ent->mnt_dir);