Add 0.15 hotfix

Package-Manager: portage-2.1.4.4

4 files changed, 183 insertions, 2 deletions

diff --git a/sys-fs/btrfs/ChangeLog b/sys-fs/btrfs/ChangeLog
index 02eabc7f1d9a..927035e68454 100644
--- a/sys-fs/btrfs/ChangeLog
+++ b/sys-fs/btrfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/btrfs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs/ChangeLog,v 1.6 2008/06/09 18:03:12 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs/ChangeLog,v 1.7 2008/06/12 05:24:48 lavajoe Exp $
+
+*btrfs-0.15-r2 (12 Jun 2008)
+
+  12 Jun 2008; Joe Peterson <lavajoe@gentoo.org>
+  +files/btrfs-0.15-r2-hotfix.patch, +btrfs-0.15-r2.ebuild:
+  Add 0.15 hotfix
 
   09 Jun 2008; Joe Peterson <lavajoe@gentoo.org> btrfs-9999.ebuild:
   Use unstable repo for live ebuild
diff --git a/sys-fs/btrfs/Manifest b/sys-fs/btrfs/Manifest
index 9392c41d916d..a6aa9040c699 100644
--- a/sys-fs/btrfs/Manifest
+++ b/sys-fs/btrfs/Manifest
@@ -1,10 +1,12 @@
 AUX btrfs-0.14-hotfix.patch 14508 RMD160 df98080a725a9882ca3185c87421f8ac4c5266f2 SHA1 2d9dca87cde74b0943947d35cf6f0c09980cb9da SHA256 0e6370569cf70da7160398bbaa41b725b77a46ba1597b7db80bb1f85e4be0788
 AUX btrfs-0.15-acl-disable.patch 1260 RMD160 3700cd0baa293d02ff2ec490e081e8919ee64119 SHA1 8c02e30e6b844e837d2ce31109a7e50739cc9522 SHA256 8b410a8eea96d54b5cfc3d683d7fae9d8f9f8fdbff008289e37380cdf16a6808
+AUX btrfs-0.15-r2-hotfix.patch 7478 RMD160 adb3238cf17e1af33b4ab17ee5ece40addec5995 SHA1 3e48fe2ea46d172cb6cf555ba5821e4cd15c20cf SHA256 2c7edfeea3f2e2ff746cd185b3692cb23019879862c87652399b35c81dbeb9d1
 DIST btrfs-0.14.tar.bz2 103694 RMD160 0e3fa6ee1583452a4818356dff1f2868502811a1 SHA1 1265a79c9b0e87858fcba319854b601b865d097c SHA256 b57a853a0ec0152c3561688a1fd250b68e361b6d0fd0bd6526802a2d7829bcf9
 DIST btrfs-0.15.tar.bz2 107545 RMD160 ad8fbe78395d1f425a769eec9719bb60b63b73e6 SHA1 37930ab229b9795db41b02e25713f886758f3b42 SHA256 f6e0d004c0c13d375718c3ab063e1386e8e6262d78f958b15fad13a8d301433e
 EBUILD btrfs-0.14.ebuild 1360 RMD160 353e78e06d3d7286347424fd455f004a1f02b9bf SHA1 1979c6b2a42891d4d160a01ee0f093df68b45984 SHA256 8562f0fb68f0d6e1e522c72fd011919a8483a7c441d81774ce5b317cc1b40c38
 EBUILD btrfs-0.15-r1.ebuild 1513 RMD160 39a21dc1fa269741a804a5794e1dbed8e3ede49f SHA1 d496b6c7db2b4931443c379aab8997ff37c1df38 SHA256 5130c6b9c053dab335324edb4f66fc0d8f72dddea889c5ba52c17e695e5ae8bb
+EBUILD btrfs-0.15-r2.ebuild 1554 RMD160 321124b72ea4f57914acabaa23bbed21ec830615 SHA1 60996bc8e6f243976bfe311acb7b9dcc2c274065 SHA256 1688a6e90262f26ddbc675c53e134c5496a6b96bdca80319cbab263c7afd2fae
 EBUILD btrfs-0.15.ebuild 1464 RMD160 c445fcab88206a1570e37fee4b80dbb941d87307 SHA1 fa71ef16abd3dd378daa63e45cf20dd7e9fabf7d SHA256 e12a4e1303b1485e279ae4aabf52b789fb1ebb896f2f73c42ed62236f80332f8
 EBUILD btrfs-9999.ebuild 1529 RMD160 c5c2a6337ef006097f08c334d044389b95f0f9ed SHA1 f12da2c1d24dc8933a1823cae3bd10d7a9a06ef8 SHA256 d69263f3edf20461745f60185f2abc8ca48b896f33dce5396625f52e49c8484c
-MISC ChangeLog 1130 RMD160 ca6039f21aa4ec25b3b47be4e7291221b1e0223d SHA1 76e6948c4584c569614407e9489e3f5f5e236114 SHA256 203b668e14a08b6f7cf83768c5938e627dc932825cb722e5b13c8988d29c61ea
+MISC ChangeLog 1288 RMD160 f9a4fda133319d635c82be099b362e8f5ec2b6f4 SHA1 804f0f66ad27efa96a28ef7f478a1c42c1885493 SHA256 b573cbbefcc29dd3c7f44ba64c02073a0341b9564f0b49ae6657f54db0b7d3e1
 MISC metadata.xml 223 RMD160 0c9c59654305e8789fe6c93fd07c561cfe003f54 SHA1 7904e6fb45104baf2cb67fb9886c633af4dc7056 SHA256 a24b49fe5448d4cb329acf1d8113ac30eb1d61d63a7319b66c077d3f1775d055
diff --git a/sys-fs/btrfs/btrfs-0.15-r2.ebuild b/sys-fs/btrfs/btrfs-0.15-r2.ebuild
new file mode 100644
index 000000000000..fcff35773802
--- /dev/null
+++ b/sys-fs/btrfs/btrfs-0.15-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs/btrfs-0.15-r2.ebuild,v 1.1 2008/06/12 05:24:48 lavajoe Exp $
+
+inherit eutils linux-mod
+
+DESCRIPTION="A checksumming copy-on-write filesystem"
+HOMEPAGE="http://btrfs.wiki.kernel.org/"
+SRC_URI="http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-fs/e2fsprogs"
+PDEPEND="~sys-fs/btrfs-progs-${PV}"
+
+pkg_setup()
+{
+	linux-mod_pkg_setup
+
+	BUILD_TARGETS="all"
+	BUILD_PARAMS="KERNELDIR=/lib/modules/${KV_FULL}/build"
+	MODULE_NAMES="btrfs(fs:${S}/"
+
+	if ! kernel_is 2 6; then
+		eerror "Need a 2.6 kernel to compile against!"
+		die "Need a 2.6 kernel to compile against!"
+	fi
+
+	if ! linux_chkconfig_present LIBCRC32C; then
+		eerror "You need to enable LIBCRC32C in your kernel!"
+		die "You need to enable LIBCRC32C in your kernel!"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PF}-hotfix.patch"
+	epatch "${FILESDIR}/${P}-acl-disable.patch"
+}
+
+src_install()
+{
+	linux-mod_src_install
+
+	dodoc INSTALL TODO
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	ewarn "WARNING: Btrfs is under heavy development and is not suitable for"
+	ewarn "         any uses other than benchmarking and review."
+	ewarn "         The Btrfs disk format is not yet finalized."
+	ewarn ""
+	ewarn "Note: If upgrading from 0.14, there is no disk format change,"
+	ewarn "      but it might be prudent to fsck after upgrading."
+}
diff --git a/sys-fs/btrfs/files/btrfs-0.15-r2-hotfix.patch b/sys-fs/btrfs/files/btrfs-0.15-r2-hotfix.patch
new file mode 100644
index 000000000000..4e22e185145d
--- /dev/null
+++ b/sys-fs/btrfs/files/btrfs-0.15-r2-hotfix.patch
@@ -0,0 +1,111 @@
+Files btrfs-0.15/.hg/00changelog.i and kernel/.hg/00changelog.i differ
+diff -Nur btrfs-0.15/.hg/branch kernel/.hg/branch
+--- btrfs-0.15/.hg/branch	1969-12-31 17:00:00.000000000 -0700
++++ kernel/.hg/branch	2008-06-11 23:19:10.000000000 -0600
+@@ -0,0 +1 @@
++default
+diff -Nur btrfs-0.15/.hg/branch.cache kernel/.hg/branch.cache
+--- btrfs-0.15/.hg/branch.cache	1969-12-31 17:00:00.000000000 -0700
++++ kernel/.hg/branch.cache	2008-06-11 23:19:09.000000000 -0600
+@@ -0,0 +1,2 @@
++9da425337329bbdd0c1cfd37deb058885744a140 558
++9da425337329bbdd0c1cfd37deb058885744a140 default
+Files btrfs-0.15/.hg/dirstate and kernel/.hg/dirstate differ
+diff -Nur btrfs-0.15/.hg/hgrc kernel/.hg/hgrc
+--- btrfs-0.15/.hg/hgrc	1969-12-31 17:00:00.000000000 -0700
++++ kernel/.hg/hgrc	2008-06-11 23:19:09.000000000 -0600
+@@ -0,0 +1,2 @@
++[paths]
++default = http://www.kernel.org/hg/btrfs/kernel
+diff -Nur btrfs-0.15/.hg/requires kernel/.hg/requires
+--- btrfs-0.15/.hg/requires	1969-12-31 17:00:00.000000000 -0700
++++ kernel/.hg/requires	2008-06-11 23:19:04.000000000 -0600
+@@ -0,0 +1,2 @@
++revlogv1
++store
+Files btrfs-0.15/.hg/store/00changelog.d and kernel/.hg/store/00changelog.d differ
+Files btrfs-0.15/.hg/store/00changelog.i and kernel/.hg/store/00changelog.i differ
+Files btrfs-0.15/.hg/store/00manifest.d and kernel/.hg/store/00manifest.d differ
+Files btrfs-0.15/.hg/store/00manifest.i and kernel/.hg/store/00manifest.i differ
+Files btrfs-0.15/.hg/store/data/.hgtags.i and kernel/.hg/store/data/.hgtags.i differ
+Files btrfs-0.15/.hg/store/data/_c_o_p_y_i_n_g.i and kernel/.hg/store/data/_c_o_p_y_i_n_g.i differ
+Files btrfs-0.15/.hg/store/data/_i_n_s_t_a_l_l.i and kernel/.hg/store/data/_i_n_s_t_a_l_l.i differ
+Files btrfs-0.15/.hg/store/data/_makefile.i and kernel/.hg/store/data/_makefile.i differ
+Files btrfs-0.15/.hg/store/data/_t_o_d_o.i and kernel/.hg/store/data/_t_o_d_o.i differ
+Files btrfs-0.15/.hg/store/data/acl.c.i and kernel/.hg/store/data/acl.c.i differ
+Files btrfs-0.15/.hg/store/data/bit-radix.c.i and kernel/.hg/store/data/bit-radix.c.i differ
+Files btrfs-0.15/.hg/store/data/bit-radix.h.i and kernel/.hg/store/data/bit-radix.h.i differ
+Files btrfs-0.15/.hg/store/data/btrfs__inode.h.i and kernel/.hg/store/data/btrfs__inode.h.i differ
+Files btrfs-0.15/.hg/store/data/compat.h.i and kernel/.hg/store/data/compat.h.i differ
+Files btrfs-0.15/.hg/store/data/crc32c.h.i and kernel/.hg/store/data/crc32c.h.i differ
+Files btrfs-0.15/.hg/store/data/ctree.c.i and kernel/.hg/store/data/ctree.c.i differ
+Files btrfs-0.15/.hg/store/data/ctree.h.i and kernel/.hg/store/data/ctree.h.i differ
+Files btrfs-0.15/.hg/store/data/debug-tree.c.i and kernel/.hg/store/data/debug-tree.c.i differ
+Files btrfs-0.15/.hg/store/data/dir-item.c.i and kernel/.hg/store/data/dir-item.c.i differ
+Files btrfs-0.15/.hg/store/data/dir-test.c.i and kernel/.hg/store/data/dir-test.c.i differ
+Files btrfs-0.15/.hg/store/data/disk-io.c.i and kernel/.hg/store/data/disk-io.c.i differ
+Files btrfs-0.15/.hg/store/data/disk-io.h.i and kernel/.hg/store/data/disk-io.h.i differ
+Files btrfs-0.15/.hg/store/data/extent-tree.c.i and kernel/.hg/store/data/extent-tree.c.i differ
+Files btrfs-0.15/.hg/store/data/extent__io.c.i and kernel/.hg/store/data/extent__io.c.i differ
+Files btrfs-0.15/.hg/store/data/extent__io.h.i and kernel/.hg/store/data/extent__io.h.i differ
+Files btrfs-0.15/.hg/store/data/extent__map.c.i and kernel/.hg/store/data/extent__map.c.i differ
+Files btrfs-0.15/.hg/store/data/extent__map.h.i and kernel/.hg/store/data/extent__map.h.i differ
+Files btrfs-0.15/.hg/store/data/file-item.c.i and kernel/.hg/store/data/file-item.c.i differ
+Files btrfs-0.15/.hg/store/data/file.c.i and kernel/.hg/store/data/file.c.i differ
+Files btrfs-0.15/.hg/store/data/hash.c.i and kernel/.hg/store/data/hash.c.i differ
+Files btrfs-0.15/.hg/store/data/hash.h.i and kernel/.hg/store/data/hash.h.i differ
+Files btrfs-0.15/.hg/store/data/hasher.c.i and kernel/.hg/store/data/hasher.c.i differ
+Files btrfs-0.15/.hg/store/data/inode-item.c.i and kernel/.hg/store/data/inode-item.c.i differ
+Files btrfs-0.15/.hg/store/data/inode-map.c.i and kernel/.hg/store/data/inode-map.c.i differ
+Files btrfs-0.15/.hg/store/data/inode.c.i and kernel/.hg/store/data/inode.c.i differ
+Files btrfs-0.15/.hg/store/data/ioctl.h.i and kernel/.hg/store/data/ioctl.h.i differ
+Files btrfs-0.15/.hg/store/data/kerncompat.h.i and kernel/.hg/store/data/kerncompat.h.i differ
+Files btrfs-0.15/.hg/store/data/list.h.i and kernel/.hg/store/data/list.h.i differ
+Files btrfs-0.15/.hg/store/data/mkfs.c.i and kernel/.hg/store/data/mkfs.c.i differ
+Files btrfs-0.15/.hg/store/data/ordered-data.c.i and kernel/.hg/store/data/ordered-data.c.i differ
+Files btrfs-0.15/.hg/store/data/ordered-data.h.i and kernel/.hg/store/data/ordered-data.h.i differ
+Files btrfs-0.15/.hg/store/data/print-tree.c.i and kernel/.hg/store/data/print-tree.c.i differ
+Files btrfs-0.15/.hg/store/data/print-tree.h.i and kernel/.hg/store/data/print-tree.h.i differ
+Files btrfs-0.15/.hg/store/data/quick-test.c.i and kernel/.hg/store/data/quick-test.c.i differ
+Files btrfs-0.15/.hg/store/data/radix-tree.c.i and kernel/.hg/store/data/radix-tree.c.i differ
+Files btrfs-0.15/.hg/store/data/radix-tree.h.i and kernel/.hg/store/data/radix-tree.h.i differ
+Files btrfs-0.15/.hg/store/data/random-test.c.i and kernel/.hg/store/data/random-test.c.i differ
+Files btrfs-0.15/.hg/store/data/root-tree.c.i and kernel/.hg/store/data/root-tree.c.i differ
+Files btrfs-0.15/.hg/store/data/struct-funcs.c.i and kernel/.hg/store/data/struct-funcs.c.i differ
+Files btrfs-0.15/.hg/store/data/super.c.i and kernel/.hg/store/data/super.c.i differ
+Files btrfs-0.15/.hg/store/data/sysfs.c.i and kernel/.hg/store/data/sysfs.c.i differ
+Files btrfs-0.15/.hg/store/data/transaction.c.i and kernel/.hg/store/data/transaction.c.i differ
+Files btrfs-0.15/.hg/store/data/transaction.h.i and kernel/.hg/store/data/transaction.h.i differ
+Files btrfs-0.15/.hg/store/data/tree-defrag.c.i and kernel/.hg/store/data/tree-defrag.c.i differ
+Files btrfs-0.15/.hg/store/data/volumes.c.i and kernel/.hg/store/data/volumes.c.i differ
+Files btrfs-0.15/.hg/store/data/volumes.h.i and kernel/.hg/store/data/volumes.h.i differ
+Files btrfs-0.15/.hg/store/data/xattr.c.i and kernel/.hg/store/data/xattr.c.i differ
+Files btrfs-0.15/.hg/store/data/xattr.h.i and kernel/.hg/store/data/xattr.h.i differ
+Files btrfs-0.15/.hg/store/undo and kernel/.hg/store/undo differ
+diff -Nur btrfs-0.15/.hg_archival.txt kernel/.hg_archival.txt
+--- btrfs-0.15/.hg_archival.txt	2008-05-29 08:31:43.000000000 -0600
++++ kernel/.hg_archival.txt	1969-12-31 17:00:00.000000000 -0700
+@@ -1,2 +0,0 @@
+-repo: 972e56533d49456b288abe364ba0295fa8c0e0ad
+-node: 4b7e2b315a32d2a1175f70f39f38b8824d8ed9e1
+diff -Nur btrfs-0.15/transaction.c kernel/transaction.c
+--- btrfs-0.15/transaction.c	2008-05-29 08:31:43.000000000 -0600
++++ kernel/transaction.c	2008-06-11 23:19:10.000000000 -0600
+@@ -56,7 +56,6 @@
+ 		total_trans++;
+ 		BUG_ON(!cur_trans);
+ 		root->fs_info->generation++;
+-		root->fs_info->running_transaction = cur_trans;
+ 		root->fs_info->last_alloc = 0;
+ 		root->fs_info->last_data_alloc = 0;
+ 		cur_trans->num_writers = 1;
+@@ -74,6 +73,9 @@
+ 		extent_io_tree_init(&cur_trans->dirty_pages,
+ 				     root->fs_info->btree_inode->i_mapping,
+ 				     GFP_NOFS);
++		spin_lock(&root->fs_info->new_trans_lock);
++		root->fs_info->running_transaction = cur_trans;
++		spin_unlock(&root->fs_info->new_trans_lock);
+ 	} else {
+ 		cur_trans->num_writers++;
+ 		cur_trans->num_joined++;