Compare commits

...

11 Commits
rawhide ... f22

Author SHA1 Message Date
Eric Sandeen 59dd8d7eb5 New upstream version v4.4 2016-01-25 10:58:02 -06:00
Eric Sandeen 8d6f324023 Merge branch 'master' into f22
Conflicts:
	.gitignore
	btrfs-progs.spec
	sources
2015-11-18 11:47:13 -06:00
Eric Sandeen 6da9ec82a6 New upstream version v4.2.2 2015-10-08 10:21:41 -05:00
Eric Sandeen f46b4f2e14 New upstream version v4.2.1 2015-09-22 04:19:45 -05:00
Eric Sandeen 4c8914cc0a New upstream version v4.2 2015-09-03 13:40:45 -05:00
Eric Sandeen a25b112e67 New upstream version 4.1.2
add patch to fix mkfs bug with bad options
2015-08-14 18:57:48 -05:00
Eric Sandeen 5f21ebf029 New upstream version v4.1 2015-06-22 16:19:43 -05:00
Eric Sandeen 23dfddea25 sources 2015-04-29 19:03:52 -05:00
Eric Sandeen 02d6739df6 New upstream version v4.0 2015-04-29 18:43:05 -05:00
Eric Sandeen 08c1df19ba New upstream version v3.19.1 2015-03-26 13:31:32 -05:00
Eric Sandeen 3a3eef218d New upstream version v3.19 2015-03-11 16:30:09 -05:00
4 changed files with 32 additions and 2 deletions

1
.gitignore vendored
View File

@ -21,3 +21,4 @@
/btrfs-progs-v4.2.1.tar.xz
/btrfs-progs-v4.2.2.tar.xz
/btrfs-progs-v4.3.1.tar.xz
/btrfs-progs-v4.4.tar.xz

View File

@ -0,0 +1,26 @@
commit 4add89acc9cb0786aa123af4f33b6e45c724dca0
Author: Qu Wenruo <quwenruo@cn.fujitsu.com>
Date: Wed Jul 29 10:28:17 2015 +0800
btrfs-progs: Add missing exit for parse_profile function
In parse_profile() function, in error handling route, it output error
message but forgot to exit(1), causing even profile is not valid, it
will just fallback to single.
Reported-by: James Harvey <jamespharvey20@gmail.com>
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
diff --git a/mkfs.c b/mkfs.c
index 9073f87..7d635dc 100644
--- a/mkfs.c
+++ b/mkfs.c
@@ -356,6 +356,7 @@ static u64 parse_profile(char *s)
return 0;
} else {
fprintf(stderr, "Unknown profile %s\n", s);
+ exit(1);
}
/* not reached */
return 0;

View File

@ -1,5 +1,5 @@
Name: btrfs-progs
Version: 4.3.1
Version: 4.4
Release: 1%{?dist}
Summary: Userspace programs for btrfs
@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libbtrfs.so
%changelog
* Mon Jan 25 2016 Eric Sandeen <sandeen@redhat.com> 4.4-1
- New upstream release
* Wed Nov 18 2015 Eric Sandeen <sandeen@redhat.com> 4.3.1-1
- New upstream release

View File

@ -1 +1 @@
ae04b324a059482e4c7e9710043c4e93 btrfs-progs-v4.3.1.tar.xz
431e53f6ee1d3930687d7c431f5711df btrfs-progs-v4.4.tar.xz