rpms/e2fsprogs/devel e2fsprogs-1.38-dm.patch,1.2,1.3

[fedora-cvs-commits at redhat.com]

Author: pjones

Update of /cvs/dist/rpms/e2fsprogs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12032

Modified Files:
	e2fsprogs-1.38-dm.patch 
Log Message:
- fix missing dm_task_destroy() cases.


e2fsprogs-1.38-dm.patch:
 e2fsck/Makefile.in    |    2 
 lib/blkid/Makefile.in |   22 +++----
 lib/blkid/blkidP.h    |    1 
 lib/blkid/devname.c   |  153 ++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 166 insertions(+), 12 deletions(-)

Index: e2fsprogs-1.38-dm.patch
===================================================================
RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs-1.38-dm.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- e2fsprogs-1.38-dm.patch	4 Jan 2006 21:30:35 -0000	1.2
+++ e2fsprogs-1.38-dm.patch	9 Jan 2006 21:57:57 -0000	1.3
@@ -1,5 +1,5 @@
 --- e2fsprogs-1.38/e2fsck/Makefile.in.dm	2005-06-29 13:42:20.000000000 -0400
-+++ e2fsprogs-1.38/e2fsck/Makefile.in	2006-01-04 15:51:47.000000000 -0500
++++ e2fsprogs-1.38/e2fsck/Makefile.in	2006-01-04 16:19:18.000000000 -0500
 @@ -20,7 +20,7 @@
  DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(DEPLIBUUID)
  
@@ -10,7 +10,7 @@
  	$(DEPSTATIC_LIBUUID)
  
 --- e2fsprogs-1.38/lib/blkid/blkidP.h.dm	2005-05-07 14:16:09.000000000 -0400
-+++ e2fsprogs-1.38/lib/blkid/blkidP.h	2006-01-04 15:51:47.000000000 -0500
++++ e2fsprogs-1.38/lib/blkid/blkidP.h	2006-01-04 16:19:18.000000000 -0500
 @@ -118,6 +118,7 @@
  /*
   * Priority settings for different types of devices
@@ -20,7 +20,7 @@
  #define BLKID_PRI_LVM	20
  #define BLKID_PRI_MD	10
 --- e2fsprogs-1.38/lib/blkid/devname.c.dm	2005-05-07 15:26:03.000000000 -0400
-+++ e2fsprogs-1.38/lib/blkid/devname.c	2006-01-04 16:15:01.000000000 -0500
++++ e2fsprogs-1.38/lib/blkid/devname.c	2006-01-09 16:55:31.000000000 -0500
 @@ -11,6 +11,8 @@
   * %End-Header%
   */
@@ -48,7 +48,7 @@
  		if (tmp->bid_devno == devno) {
  			if (only_if_new)
  				return;
-@@ -137,6 +143,146 @@
+@@ -137,6 +143,152 @@
  	return;
  }
  
@@ -106,8 +106,10 @@
 +
 +	dm_task_run(task);
 +	names = dm_task_get_names(task);
-+	if (!names || !names->dev)
++	if (!names || !names->dev) {
++		dm_task_destroy(task);
 +		return 1;
++	}
 +
 +	n = 0;
 +	do {
@@ -138,8 +140,10 @@
 +	dm_task_run(task);
 +	dm_task_get_info(task, &info);
 +
-+	if (!info.exists)
++	if (!info.exists) {
++		dm_task_destroy(task);
 +		return ret;
++	}
 +
 +	ret = makedev(info.major, info.minor);
 +
@@ -161,8 +165,10 @@
 +
 +	dm_task_run(task);
 +	names = dm_task_get_names(task);
-+	if (!names || !names->dev)
++	if (!names || !names->dev) {
++		dm_task_destroy(task);
 +		return;
++	}
 +
 +	n = 0;
 +	do {
@@ -195,7 +201,7 @@
  #define PROC_PARTITIONS "/proc/partitions"
  #define VG_DIR		"/proc/lvm/VGs"
  
-@@ -290,6 +436,7 @@
+@@ -290,6 +442,7 @@
  		return 0;
  
  	blkid_read_cache(cache);
@@ -204,7 +210,7 @@
  #ifdef VG_DIR
  	lvm_probe_all(cache, only_if_new);
 --- e2fsprogs-1.38/lib/blkid/Makefile.in.dm	2005-06-29 13:39:54.000000000 -0400
-+++ e2fsprogs-1.38/lib/blkid/Makefile.in	2006-01-04 16:18:38.000000000 -0500
++++ e2fsprogs-1.38/lib/blkid/Makefile.in	2006-01-04 16:19:18.000000000 -0500
 @@ -37,7 +37,7 @@
  ELF_IMAGE = libblkid
  ELF_MYDIR = blkid