[btrfs-progs] New btrfs-progs upstream snapshot

[Eric Sandeen]

commit d74e65b6894dbfdb5ac0bfd6cf0f1d4f3c63ec2d
Author: Eric Sandeen <sandeen at redhat.com>
Date:   Fri Mar 8 17:53:17 2013 -0600

    New btrfs-progs upstream snapshot

 Btrfs-progs-add-btrfs-device-ready-command.patch   |   84 ----------
 ...-detect-if-the-disk-we-are-formatting-is-.patch |  167 --------------------
 ...-make-btrfs-filesystem-show-uuid-actually.patch |   37 -----
 btrfs-progs-build-everything.patch                 |   13 --
 btrfs-progs-build-fixes.patch                      |   34 ----
 ...progs-correct-uninitialized-fsid-variable.patch |   55 -------
 btrfs-progs-fix-labels.patch                       |   24 ---
 btrfs-progs-valgrind.patch                         |   24 +---
 btrfs-progs.spec                                   |   35 ++---
 ...r-caches-when-opening-and-closing-devices.patch |  107 -------------
 sources                                            |    2 +-
 11 files changed, 18 insertions(+), 564 deletions(-)
---
diff --git a/btrfs-progs-valgrind.patch b/btrfs-progs-valgrind.patch
index 49f0e4b..0ad3927 100644
--- a/btrfs-progs-valgrind.patch
+++ b/btrfs-progs-valgrind.patch
@@ -1,19 +1,10 @@
+Not-upstream changes from Josef.  Some bits have made it usptream
+and have been removed; the rest needs some reverse-engineering.
+
 diff -up btrfs-progs-0.19/btrfsck.c.orig btrfs-progs-0.19/btrfsck.c
 diff -up btrfs-progs-0.19/disk-io.c.orig btrfs-progs-0.19/disk-io.c
 --- btrfs-progs-0.19/disk-io.c.orig	2012-04-11 10:42:36.213042556 -0400
 +++ btrfs-progs-0.19/disk-io.c	2012-04-11 10:42:58.790867701 -0400
-@@ -458,8 +458,10 @@ static int find_and_setup_log_root(struc
- 	u64 blocknr = btrfs_super_log_root(disk_super);
- 	struct btrfs_root *log_root = malloc(sizeof(struct btrfs_root));
- 
--	if (blocknr == 0)
-+	if (blocknr == 0) {
-+		free(log_root);
- 		return 0;
-+	}
- 
- 	blocksize = btrfs_level_size(tree_root,
- 			     btrfs_super_log_root_level(disk_super));
 @@ -622,7 +624,7 @@ static struct btrfs_fs_info *__open_ctre
  	struct btrfs_root *chunk_root = malloc(sizeof(struct btrfs_root));
  	struct btrfs_root *dev_root = malloc(sizeof(struct btrfs_root));
@@ -150,15 +141,6 @@ diff -up btrfs-progs-0.19/volumes.c.orig btrfs-progs-0.19/volumes.c
  int btrfs_num_copies(struct btrfs_mapping_tree *map_tree, u64 logical, u64 len)
  {
  	struct cache_extent *ce;
-@@ -1484,7 +1498,7 @@ int btrfs_read_sys_array(struct btrfs_ro
- 	if (!sb)
- 		return -ENOMEM;
- 	btrfs_set_buffer_uptodate(sb);
--	write_extent_buffer(sb, super_copy, 0, BTRFS_SUPER_INFO_SIZE);
-+	write_extent_buffer(sb, super_copy, 0, sizeof(*super_copy));
- 	array_size = btrfs_super_sys_array_size(super_copy);
- 
- 	/*
 diff -up btrfs-progs-0.19/volumes.h.orig btrfs-progs-0.19/volumes.h
 --- btrfs-progs-0.19/volumes.h.orig	2012-04-11 10:42:36.228042439 -0400
 +++ btrfs-progs-0.19/volumes.h	2012-04-11 10:43:03.314832666 -0400
diff --git a/btrfs-progs.spec b/btrfs-progs.spec
index 03b6986..283e4ec 100644
--- a/btrfs-progs.spec
+++ b/btrfs-progs.spec
@@ -1,22 +1,17 @@
 Name:           btrfs-progs
-Version:        0.20.rc1.20121017git91d9eec
-Release:        3%{?dist}
+Version:        0.20.rc1.20130308git704a08c
+Release:        1%{?dist}
 Summary:        Userspace programs for btrfs
 
 Group:          System Environment/Base
 License:        GPLv2
 URL:            http://btrfs.wiki.kernel.org/index.php/Main_Page
 Source0:	%{name}-%{version}.tar.bz2
-Patch0: btrfs-progs-fix-labels.patch
-Patch1: btrfs-progs-valgrind.patch
-Patch2: btrfs-progs-build-fixes.patch
-Patch3: Btrfs-progs-add-btrfs-device-ready-command.patch
-Patch4: Btrfs-progs-detect-if-the-disk-we-are-formatting-is-.patch
-Patch5: btrfs-init-dev-list.patch
-# Partial fix for RHBZ#863978 (but only in Rawhide).
-# Upstream: https://git.kernel.org/?p=linux/kernel/git/mason/btrfs-progs.git;a=commitdiff;h=8fe354744cd7b5c4f7a3314dcdbb5095192a032f
-# See also: http://thread.gmane.org/gmane.comp.file-systems.btrfs/23249
-Patch6: clear-caches-when-opening-and-closing-devices.patch
+
+# Valgrind patch no longer applied, but kept for posterity
+# Still must reverse-engineer fixes in there and get upstream
+Patch0: btrfs-progs-valgrind.patch
+Patch1: btrfs-init-dev-list.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,16 +25,10 @@ check, modify and correct any inconsistencies in the btrfs filesystem.
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %build
-make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -63,8 +52,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/btrfs
 %{_sbindir}/btrfs-map-logical
 %{_sbindir}/btrfs-zero-log
-%{_sbindir}/btrfs-restore
 %{_sbindir}/btrfs-find-root
+%{_sbindir}/btrfs-show-super
 %{_mandir}/man8/btrfs-image.8.gz
 %{_mandir}/man8/btrfs-show.8.gz
 %{_mandir}/man8/btrfsck.8.gz
@@ -73,6 +62,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/btrfs.8.gz
 
 %changelog
+* Fri Mar 08 2013 Eric Sandeen <sandeen at redhat.com> 0.20.rc1.20130308git704a08c-1
+- New upstream snapshot
+- btrfs-restore is now a command in the btrfs utility
+
 * Wed Feb 13 2013 Richard W.M. Jones <rjones at redhat.com> 0.20.rc1.20121017git91d9eec-3
 - Include upstream patch to clear caches as a partial fix for RHBZ#863978.
 
@@ -177,7 +170,7 @@ rm -rf $RPM_BUILD_ROOT
 * Sat Jan 10 2009 Marek Mahut <mmahut at fedoraproject.org> 0.16-1
 - Upstream release 0.16
 
-* Mon Jun 25 2008 Josef Bacik <josef at toxicpanda.com> 0.15-4
+* Wed Jun 25 2008 Josef Bacik <josef at toxicpanda.com> 0.15-4
 -use fedoras normal CFLAGS
 
 * Mon Jun 23 2008 Josef Bacik <josef at toxicpanda.com> 0.15-3
diff --git a/sources b/sources
index 6c3dfd9..8d0f054 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b44804be936858099ed1fc5b9c247c6e  btrfs-progs-0.20.rc1.20121017git91d9eec.tar.bz2
+be14c7227165ad1134355503a85fcfa8  btrfs-progs-0.20.rc1.20130308git704a08c.tar.bz2