Hello community, here is the log from the commit of package btrfsprogs for openSUSE:Factory checked in at 2014-12-05 21:07:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/btrfsprogs (Old) and /work/SRC/openSUSE:Factory/.btrfsprogs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "btrfsprogs" Changes: -------- --- /work/SRC/openSUSE:Factory/btrfsprogs/btrfsprogs.changes 2014-11-29 08:39:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.btrfsprogs.new/btrfsprogs.changes 2014-12-05 21:07:43.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Dec 4 00:00:00 CET 2014 - [email protected] + +- version 3.17.3 + - convert: fix conversion of sparse ext* filesystems + - show: resolve to the correct path + - fsck: more verbose error for root dir problems + +------------------------------------------------------------------- Old: ---- btrfs-progs-v3.17.2.tar.gz New: ---- btrfs-progs-v3.17.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ btrfsprogs.spec ++++++ --- /var/tmp/diff_new_pack.PGdOqV/_old 2014-12-05 21:07:45.000000000 +0100 +++ /var/tmp/diff_new_pack.PGdOqV/_new 2014-12-05 21:07:45.000000000 +0100 @@ -17,7 +17,7 @@ Name: btrfsprogs -Version: 3.17.2 +Version: 3.17.3 Release: 0 Summary: Utilities for the Btrfs filesystem License: GPL-2.0 ++++++ btrfs-progs-v3.17.2.tar.gz -> btrfs-progs-v3.17.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v3.17.2/btrfs-convert.c new/btrfs-progs-v3.17.3/btrfs-convert.c --- old/btrfs-progs-v3.17.2/btrfs-convert.c 2014-11-19 17:44:56.000000000 +0100 +++ new/btrfs-progs-v3.17.3/btrfs-convert.c 2014-12-04 14:47:18.000000000 +0100 @@ -393,7 +393,7 @@ ret = btrfs_record_file_extent(trans, root, objectid, inode, file_pos, disk_bytenr, num_bytes); - if (ret || !checksum) + if (ret || !checksum || disk_bytenr == 0) return ret; return csum_disk_extent(trans, root, disk_bytenr, num_bytes); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v3.17.2/btrfs-list.c new/btrfs-progs-v3.17.3/btrfs-list.c --- old/btrfs-progs-v3.17.2/btrfs-list.c 2014-11-19 17:44:56.000000000 +0100 +++ new/btrfs-progs-v3.17.3/btrfs-list.c 2014-12-04 14:47:18.000000000 +0100 @@ -1711,7 +1711,7 @@ ret = ioctl(fd, BTRFS_IOC_TREE_SEARCH, &args); e = errno; if (ret < 0) { - fprintf(stderr, "ERROR: can't perform the search- %s\n", + fprintf(stderr, "ERROR: can't perform the search - %s\n", strerror(e)); break; } @@ -1911,7 +1911,7 @@ ret = ioctl(fd, BTRFS_IOC_INO_LOOKUP, &args); if (ret < 0) { fprintf(stderr, - "ERROR: can't perform the search -%s\n", + "ERROR: can't perform the search - %s\n", strerror(errno)); return ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v3.17.2/cmds-check.c new/btrfs-progs-v3.17.3/cmds-check.c --- old/btrfs-progs-v3.17.2/cmds-check.c 2014-11-19 17:44:56.000000000 +0100 +++ new/btrfs-progs-v3.17.3/cmds-check.c 2014-12-04 14:47:18.000000000 +0100 @@ -1984,6 +1984,7 @@ fprintf(stderr, "root %llu root dir %llu error\n", (unsigned long long)root->root_key.objectid, (unsigned long long)root_dirid); + print_inode_error(root, rec); error++; } } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v3.17.2/cmds-filesystem.c new/btrfs-progs-v3.17.3/cmds-filesystem.c --- old/btrfs-progs-v3.17.2/cmds-filesystem.c 2014-11-19 17:44:56.000000000 +0100 +++ new/btrfs-progs-v3.17.3/cmds-filesystem.c 2014-12-04 14:47:18.000000000 +0100 @@ -901,39 +901,45 @@ if (strlen(search) == 0) usage(cmd_show_usage); type = check_arg_type(search); + /* - * needs spl handling if input arg is block dev - * And if input arg is mount-point just print it - * right away + * For search is a device: + * realpath do /dev/mapper/XX => /dev/dm-X + * which is required by BTRFS_SCAN_DEV + * For search is a mountpoint: + * realpath do /mnt/btrfs/ => /mnt/btrfs + * which shall be recognized by btrfs_scan_kernel() */ - if (type == BTRFS_ARG_BLKDEV) { - if (where == BTRFS_SCAN_LBLKID) { - /* we need to do this because - * legacy BTRFS_SCAN_DEV - * provides /dev/dm-x paths - */ - if (realpath(search, path)) - search = path; + if (!realpath(search, path)) { + fprintf(stderr, "ERROR: Could not show %s: %s\n", + search, strerror(errno)); + return 1; + } + + search = path; + + /* + * Needs special handling if input arg is block dev And if + * input arg is mount-point just print it right away + */ + if (type == BTRFS_ARG_BLKDEV && where != BTRFS_SCAN_LBLKID) { + ret = get_btrfs_mount(search, mp, sizeof(mp)); + if (!ret) { + /* given block dev is mounted */ + search = mp; + type = BTRFS_ARG_MNTPOINT; } else { - ret = get_btrfs_mount(search, - mp, sizeof(mp)); - if (!ret) { - /* given block dev is mounted*/ - search = mp; - type = BTRFS_ARG_MNTPOINT; - } else { - ret = dev_to_fsid(search, fsid); - if (ret) { - fprintf(stderr, - "ERROR: No btrfs on %s\n", - search); - return 1; - } - uuid_unparse(fsid, uuid_buf); - search = uuid_buf; - type = BTRFS_ARG_UUID; - goto devs_only; + ret = dev_to_fsid(search, fsid); + if (ret) { + fprintf(stderr, + "ERROR: No btrfs on %s\n", + search); + return 1; } + uuid_unparse(fsid, uuid_buf); + search = uuid_buf; + type = BTRFS_ARG_UUID; + goto devs_only; } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v3.17.2/cmds-replace.c new/btrfs-progs-v3.17.3/cmds-replace.c --- old/btrfs-progs-v3.17.2/cmds-replace.c 2014-11-19 17:44:56.000000000 +0100 +++ new/btrfs-progs-v3.17.3/cmds-replace.c 2014-12-04 14:47:18.000000000 +0100 @@ -53,6 +53,8 @@ return "not started"; case BTRFS_IOCTL_DEV_REPLACE_RESULT_ALREADY_STARTED: return "already started"; + case BTRFS_IOCTL_DEV_REPLACE_RESULT_SCRUB_INPROGRESS: + return "scrub is in progress"; default: return "<illegal result value>"; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v3.17.2/cmds-subvolume.c new/btrfs-progs-v3.17.3/cmds-subvolume.c --- old/btrfs-progs-v3.17.2/cmds-subvolume.c 2014-11-19 17:44:56.000000000 +0100 +++ new/btrfs-progs-v3.17.3/cmds-subvolume.c 2014-12-04 14:47:18.000000000 +0100 @@ -906,6 +906,7 @@ } if (!ret) { fprintf(stderr, "ERROR: '%s' is not a subvolume\n", fullpath); + ret = 1; goto out; } @@ -919,7 +920,6 @@ fprintf(stderr, "ERROR: %s doesn't belong to btrfs mount point\n", fullpath); - ret = -EINVAL; goto out; } ret = 1; @@ -958,13 +958,13 @@ memset(&get_ri, 0, sizeof(get_ri)); get_ri.root_id = sv_id; - if (btrfs_get_subvol(mntfd, &get_ri)) { + ret = btrfs_get_subvol(mntfd, &get_ri); + if (ret) { fprintf(stderr, "ERROR: can't find '%s'\n", svpath); goto out; } - ret = 0; /* print the info */ printf("%s\n", fullpath); printf("\tName: \t\t\t%s\n", get_ri.name); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v3.17.2/ioctl.h new/btrfs-progs-v3.17.3/ioctl.h --- old/btrfs-progs-v3.17.2/ioctl.h 2014-11-19 17:44:56.000000000 +0100 +++ new/btrfs-progs-v3.17.3/ioctl.h 2014-12-04 14:47:18.000000000 +0100 @@ -145,6 +145,7 @@ #define BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR 0 #define BTRFS_IOCTL_DEV_REPLACE_RESULT_NOT_STARTED 1 #define BTRFS_IOCTL_DEV_REPLACE_RESULT_ALREADY_STARTED 2 +#define BTRFS_IOCTL_DEV_REPLACE_RESULT_SCRUB_INPROGRESS 3 struct btrfs_ioctl_dev_replace_args { __u64 cmd; /* in */ __u64 result; /* out */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v3.17.2/qgroup-verify.c new/btrfs-progs-v3.17.3/qgroup-verify.c --- old/btrfs-progs-v3.17.2/qgroup-verify.c 2014-11-19 17:44:56.000000000 +0100 +++ new/btrfs-progs-v3.17.3/qgroup-verify.c 2014-12-04 14:47:18.000000000 +0100 @@ -553,11 +553,11 @@ struct tree_block *block) { int ret; - u64 root_bytenr = resolve_one_root(bytenr); + u64 root_id = resolve_one_root(bytenr); struct btrfs_root *root; struct btrfs_key key; - key.objectid = root_bytenr; + key.objectid = root_id; key.type = BTRFS_ROOT_ITEM_KEY; key.offset = (u64)-1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v3.17.2/qgroup.c new/btrfs-progs-v3.17.3/qgroup.c --- old/btrfs-progs-v3.17.2/qgroup.c 2014-11-19 17:44:56.000000000 +0100 +++ new/btrfs-progs-v3.17.3/qgroup.c 2014-12-04 14:47:18.000000000 +0100 @@ -1160,7 +1160,7 @@ ret = ioctl(fd, BTRFS_IOC_INO_LOOKUP, &args); if (ret < 0) { fprintf(stderr, - "ERROR: can't perform the search -%s\n", + "ERROR: can't perform the search - %s\n", strerror(errno)); return ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v3.17.2/send-utils.c new/btrfs-progs-v3.17.3/send-utils.c --- old/btrfs-progs-v3.17.2/send-utils.c 2014-11-19 17:44:56.000000000 +0100 +++ new/btrfs-progs-v3.17.3/send-utils.c 2014-12-04 14:47:18.000000000 +0100 @@ -556,7 +556,7 @@ ret = is_uuid_tree_supported(mnt_fd); if (ret < 0) { fprintf(stderr, - "ERROR: check if we support uuid tree fails- %s\n", + "ERROR: check if we support uuid tree fails - %s\n", strerror(errno)); return ret; } else if (ret) { @@ -579,7 +579,7 @@ ret = ioctl(mnt_fd, BTRFS_IOC_TREE_SEARCH, &args); e = errno; if (ret < 0) { - fprintf(stderr, "ERROR: can't perform the search- %s\n", + fprintf(stderr, "ERROR: can't perform the search - %s\n", strerror(e)); return ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfs-progs-v3.17.2/version.sh new/btrfs-progs-v3.17.3/version.sh --- old/btrfs-progs-v3.17.2/version.sh 2014-11-19 17:44:56.000000000 +0100 +++ new/btrfs-progs-v3.17.3/version.sh 2014-12-04 14:47:18.000000000 +0100 @@ -6,7 +6,7 @@ # Copyright 2008, Oracle # Released under the GNU GPLv2 -v="v3.17.2" +v="v3.17.3" lib_major=0 lib_minor=1 ++++++ local-version-override.patch ++++++ --- /var/tmp/diff_new_pack.PGdOqV/_old 2014-12-05 21:07:45.000000000 +0100 +++ /var/tmp/diff_new_pack.PGdOqV/_new 2014-12-05 21:07:45.000000000 +0100 @@ -6,8 +6,8 @@ # Copyright 2008, Oracle # Released under the GNU GPLv2 --v="v3.17.2" -+v="v3.17.2+20141119" +-v="v3.17.3" ++v="v3.17.3+20141204" lib_major=0 lib_minor=1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
