[arch-commits] Commit in btrfs-progs/trunk (2 files)

[Tom Gundersen]

    Date: Wednesday, November 27, 2013 @ 12:26:30
  Author: tomegun
Revision: 200382

upgpkg: btrfs-progs 3.12-1

upstream release

Modified:
  btrfs-progs/trunk/PKGBUILD
Deleted:
  btrfs-progs/trunk/Btrfs-progs-fix-wrong-arg-sb_bytenr-for-btrfs_scan_fs_devices.patch

---------------------------------------------------------------------+
 Btrfs-progs-fix-wrong-arg-sb_bytenr-for-btrfs_scan_fs_devices.patch |   71 ----------
 PKGBUILD                                                            |   17 --
 2 files changed, 5 insertions(+), 83 deletions(-)

Deleted: Btrfs-progs-fix-wrong-arg-sb_bytenr-for-btrfs_scan_fs_devices.patch
===================================================================
--- Btrfs-progs-fix-wrong-arg-sb_bytenr-for-btrfs_scan_fs_devices.patch	2013-11-27 10:08:51 UTC (rev 200381)
+++ Btrfs-progs-fix-wrong-arg-sb_bytenr-for-btrfs_scan_fs_devices.patch	2013-11-27 11:26:30 UTC (rev 200382)
@@ -1,71 +0,0 @@
-diff --git a/btrfs-find-root.c b/btrfs-find-root.c
-index 9b3d7df..374cf81 100644
---- a/btrfs-find-root.c
-+++ b/btrfs-find-root.c
-@@ -82,7 +82,7 @@ static struct btrfs_root *open_ctree_broken(int fd, const char *device)
- 		return NULL;
- 	}
- 
--	ret = btrfs_scan_fs_devices(fd, device, &fs_devices);
-+	ret = btrfs_scan_fs_devices(fd, device, &fs_devices, 0);
- 	if (ret)
- 		goto out;
- 
-diff --git a/cmds-chunk.c b/cmds-chunk.c
-index 03314de..6ada328 100644
---- a/cmds-chunk.c
-+++ b/cmds-chunk.c
-@@ -1291,7 +1291,7 @@ static int recover_prepare(struct recover_control *rc, char *path)
- 		goto fail_free_sb;
- 	}
- 
--	ret = btrfs_scan_fs_devices(fd, path, &fs_devices);
-+	ret = btrfs_scan_fs_devices(fd, path, &fs_devices, 0);
- 	if (ret)
- 		goto fail_free_sb;
- 
-diff --git a/disk-io.c b/disk-io.c
-index 13dbe27..f8e236c 100644
---- a/disk-io.c
-+++ b/disk-io.c
-@@ -909,13 +909,16 @@ void btrfs_cleanup_all_caches(struct btrfs_fs_info *fs_info)
- }
- 
- int btrfs_scan_fs_devices(int fd, const char *path,
--			  struct btrfs_fs_devices **fs_devices)
-+			  struct btrfs_fs_devices **fs_devices,
-+			  u64 sb_bytenr)
- {
- 	u64 total_devs;
- 	int ret;
-+	if (!sb_bytenr)
-+		sb_bytenr = BTRFS_SUPER_INFO_OFFSET;
- 
- 	ret = btrfs_scan_one_device(fd, path, fs_devices,
--				    &total_devs, BTRFS_SUPER_INFO_OFFSET);
-+				    &total_devs, sb_bytenr);
- 	if (ret) {
- 		fprintf(stderr, "No valid Btrfs found on %s\n", path);
- 		return ret;
-@@ -1001,7 +1004,7 @@ static struct btrfs_fs_info *__open_ctree_fd(int fp, const char *path,
- 	if (restore)
- 		fs_info->on_restoring = 1;
- 
--	ret = btrfs_scan_fs_devices(fp, path, &fs_devices);
-+	ret = btrfs_scan_fs_devices(fp, path, &fs_devices, sb_bytenr);
- 	if (ret)
- 		goto out;
- 
-diff --git a/disk-io.h b/disk-io.h
-index effaa9f..bc749c3 100644
---- a/disk-io.h
-+++ b/disk-io.h
-@@ -59,7 +59,7 @@ int btrfs_setup_all_roots(struct btrfs_fs_info *fs_info,
- void btrfs_release_all_roots(struct btrfs_fs_info *fs_info);
- void btrfs_cleanup_all_caches(struct btrfs_fs_info *fs_info);
- int btrfs_scan_fs_devices(int fd, const char *path,
--			  struct btrfs_fs_devices **fs_devices);
-+			  struct btrfs_fs_devices **fs_devices, u64 sb_bytenr);
- int btrfs_setup_chunk_tree_and_device_map(struct btrfs_fs_info *fs_info);
- 
- struct btrfs_root *open_ctree(const char *filename, u64 sb_bytenr, int writes);

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-27 10:08:51 UTC (rev 200381)
+++ PKGBUILD	2013-11-27 11:26:30 UTC (rev 200382)
@@ -3,8 +3,8 @@
 # Contributor: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=btrfs-progs
-pkgver=0.20rc1.3
-pkgrel=2
+pkgver=3.12
+pkgrel=1
 pkgdesc="btrfs filesystem utilities"
 arch=(i686 x86_64)
 depends=('glibc' 'e2fsprogs' 'lzo2')
@@ -14,22 +14,15 @@
 conflicts=('btrfs-progs-unstable')
 provides=('btrfs-progs-unstable')
 license=('GPL2')
-source=("git://git.kernel.org/pub/scm/linux/kernel/git/mason/${pkgname}.git#commit=194aa4a1bd6447bb545286d0bcb0b0be8204d79f"
+source=("git://git.kernel.org/pub/scm/linux/kernel/git/mason/${pkgname}.git#tag=v${pkgver}"
 	initcpio-install-btrfs
-	initcpio-hook-btrfs
-	Btrfs-progs-fix-wrong-arg-sb_bytenr-for-btrfs_scan_fs_devices.patch)
+	initcpio-hook-btrfs)
 install=btrfs-progs.install
 options=(!staticlibs)
 md5sums=('SKIP'
          '7241ba3a4286d08da0d50b7176941112'
-         'b09688a915a0ec8f40e2f5aacbabc9ad'
-         '1ef602823a7a09f98cd713f52aa33f20')
+         'b09688a915a0ec8f40e2f5aacbabc9ad')
 
-prepare() {
-   cd $pkgname
-   patch -Np1 -i $srcdir/Btrfs-progs-fix-wrong-arg-sb_bytenr-for-btrfs_scan_fs_devices.patch
-}
-
 build() {
    cd $pkgname
    make CFLAGS="$CFLAGS"