rpms/xfsprogs/devel xfsprogs-3.1.1-fd-test-fix.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 sources, 1.23, 1.24 xfsprogs.spec, 1.73, 1.74 xfsprogs-3.1.0-mkfs-fixes.patch, 1.1, NONE

[Eric Sandeen]

Author: sandeen

Update of /cvs/pkgs/rpms/xfsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8674

Modified Files:
	.cvsignore sources xfsprogs.spec 
Added Files:
	xfsprogs-3.1.1-fd-test-fix.patch 
Removed Files:
	xfsprogs-3.1.0-mkfs-fixes.patch 
Log Message:
* Mon Feb 01 2010 Eric Sandeen <sandeen at redhat.com> 3.1.1-1
- New upstream release
- Fix fd validity test for device-less mkfs invocation
 
* Sun Jan 17 2010 Eric Sandeen <sandeen at redhat.com> 3.1.0-2
- Post-release mkfs fixes (#555847)


xfsprogs-3.1.1-fd-test-fix.patch:
 xfs_mkfs.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xfsprogs-3.1.1-fd-test-fix.patch ---
Date: Sat, 30 Jan 2010 14:52:26 -0500
From: Christoph Hellwig <hch at infradead.org>
To: xfs at oss.sgi.com
Subject: [PATCH] mkfs.xfs: fix fd validity check in get_topology

Only negatie return values from open mean we failed to open the device.
Without this check we do not print the usage message when no device is
specified.  This leads to a weird failure in xfstests 122.

Signed-off-by: Christoph Hellwig <hch at lst.de>
Reviewed-by: Eric Sandeen <sandeen at sandeen.ent>
---

Index: xfsprogs-dev/mkfs/xfs_mkfs.c
===================================================================
--- xfsprogs-dev.orig/mkfs/xfs_mkfs.c	2010-01-30 20:44:03.505255109 +0100
+++ xfsprogs-dev/mkfs/xfs_mkfs.c	2010-01-30 20:44:20.579255807 +0100
@@ -455,7 +455,7 @@ static void get_topology(libxfs_init_t *
 				&ft->dsunit, &ft->dswidth, &ft->sectoralign);
 		fd = open(dfile, O_RDONLY);
 		/* If this fails we just fall back to BBSIZE */
-		if (fd) {
+		if (fd >= 0) {
 			platform_findsizes(dfile, fd, &dummy, &bsz);
 			close(fd);
 		}

_______________________________________________
xfs mailing list
xfs at oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfsprogs/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	13 Jan 2010 21:28:32 -0000	1.22
+++ .cvsignore	1 Feb 2010 18:09:40 -0000	1.23
@@ -1 +1 @@
-xfsprogs-3.1.0.tar.gz
+xfsprogs-3.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfsprogs/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	13 Jan 2010 21:28:32 -0000	1.23
+++ sources	1 Feb 2010 18:09:40 -0000	1.24
@@ -1 +1 @@
-07c1ff6a4a44b58ee5ffdabca33a4493  xfsprogs-3.1.0.tar.gz
+c2308b46ee707597ac50aae418d321b8  xfsprogs-3.1.1.tar.gz


Index: xfsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfsprogs/devel/xfsprogs.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- xfsprogs.spec	17 Jan 2010 18:01:37 -0000	1.73
+++ xfsprogs.spec	1 Feb 2010 18:09:41 -0000	1.74
@@ -1,7 +1,7 @@
 Summary:	Utilities for managing the XFS filesystem
 Name:		xfsprogs
-Version:	3.1.0
-Release:	2%{?dist}
+Version:	3.1.1
+Release:	1%{?dist}
 # Licensing based on generic "GNU GENERAL PUBLIC LICENSE"
 # in source, with no mention of version.
 # doc/COPYING file specifies what is GPL and what is LGPL
@@ -19,7 +19,7 @@ Obsoletes:	xfs-cmds <= %{version}
 Conflicts:	xfsdump < 3.0.1
 
 Patch0:		xfsprogs-3.1.0-glibc-fixes.patch
-Patch1:		xfsprogs-3.1.0-mkfs-fixes.patch
+Patch1:		xfsprogs-3.1.1-fd-test-fix.patch
 
 %description
 A set of commands to use the XFS filesystem, including mkfs.xfs.
@@ -193,7 +193,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/xfs/xfs_types.h
 
 %changelog
-* Sun Jan 17  2010 Eric Sandeen <sandeen at redhat.com> 3.1.0-2
+* Mon Feb 01 2010 Eric Sandeen <sandeen at redhat.com> 3.1.1-1
+- New upstream release
+- Fix fd validity test for device-less mkfs invocation
+ 
+* Sun Jan 17 2010 Eric Sandeen <sandeen at redhat.com> 3.1.0-2
 - Post-release mkfs fixes (#555847)
 
 * Wed Jan 13 2010 Eric Sandeen <sandeen at redhat.com> 3.1.0-1


--- xfsprogs-3.1.0-mkfs-fixes.patch DELETED ---