rpms/e2fsprogs/F-11 e2fsprogs-1.41.4-dev-mapper-names.patch, NONE, 1.1 e2fsprogs.spec, 1.136, 1.137
Eric Sandeen
sandeen at fedoraproject.org
Wed Jun 24 17:35:47 UTC 2009
Author: sandeen
Update of /cvs/pkgs/rpms/e2fsprogs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24138
Modified Files:
e2fsprogs.spec
Added Files:
e2fsprogs-1.41.4-dev-mapper-names.patch
Log Message:
* Wed Jun 24 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-12
- blkid: use /dev/mapper/<name> vs /dev/dm-<N> (#497259)
e2fsprogs-1.41.4-dev-mapper-names.patch:
--- NEW FILE e2fsprogs-1.41.4-dev-mapper-names.patch ---
From: Karel Zak <kzak at redhat.com>
Date: Mon, 27 Apr 2009 13:00:57 +0000 (+0200)
Subject: blkid: use /dev/mapper/<name> rather than /dev/dm-<N>
X-Git-Tag: v1.41.6~32
X-Git-Url: http://git.kernel.org/?p=fs%2Fext2%2Fe2fsprogs.git;a=commitdiff_plain;h=4271e23942bdc60e1fa6c0b26bc666a94a8b3e1d
blkid: use /dev/mapper/<name> rather than /dev/dm-<N>
The libblkid (since v1.41.1) returns private device-mapper names (e.g.
/dev/dm-0). It's because the probe_one() function scans /dev before
/dev/mapper.
brw-rw---- 1 root disk 253, 0 2009-04-27 13:41 /dev/dm-0
brw-rw---- 1 root disk 253, 0 2009-04-27 13:41 /dev/mapper/TestVolGroup-TestLogVolume
Old version:
# blkid -t LABEL="TEST-LABEL" -o device
/dev/dm-0
Fixed version:
# blkid -t LABEL="TEST-LABEL" -o device
/dev/mapper/TestVolGroup-TestLogVolume
Addresses-Red-Hat-Bug: #497259
Signed-off-by: Karel Zak <kzak at redhat.com>
Signed-off-by: Theodore Ts'o <tytso at mit.edu>
---
Index: e2fsprogs-1.41.4/lib/blkid/devname.c
===================================================================
--- e2fsprogs-1.41.4.orig/lib/blkid/devname.c
+++ e2fsprogs-1.41.4/lib/blkid/devname.c
@@ -179,6 +179,15 @@ static void probe_one(blkid_cache cache,
if (dev && dev->bid_devno == devno)
goto set_pri;
+ /* Try to translate private device-mapper dm-<N> names
+ * to standard /dev/mapper/<name>.
+ */
+ if (!strncmp(ptname, "dm-", 3) && isdigit(ptname[3])) {
+ blkid__scan_dir("/dev/mapper", devno, 0, &devname);
+ if (devname)
+ goto get_dev;
+ }
+
/*
* Take a quick look at /dev/ptname for the device number. We check
* all of the likely device directories. If we don't find it, or if
@@ -197,7 +206,7 @@ static void probe_one(blkid_cache cache,
if (stat(device, &st) == 0 && S_ISBLK(st.st_mode) &&
st.st_rdev == devno) {
devname = blkid_strdup(device);
- break;
+ goto get_dev;
}
}
/* Do a short-cut scan of /dev/mapper first */
@@ -208,9 +217,9 @@ static void probe_one(blkid_cache cache,
if (!devname)
return;
}
+get_dev:
dev = blkid_get_dev(cache, devname, BLKID_DEV_NORMAL);
free(devname);
-
set_pri:
if (dev) {
if (pri)
Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/F-11/e2fsprogs.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- e2fsprogs.spec 18 Jun 2009 13:51:31 -0000 1.136
+++ e2fsprogs.spec 24 Jun 2009 17:35:17 -0000 1.137
@@ -4,7 +4,7 @@
Summary: Utilities for managing ext2, ext3, and ext4 filesystems
Name: e2fsprogs
Version: 1.41.4
-Release: 11%{?dist}
+Release: 12%{?dist}
# License based on upstream-modified COPYING file,
# which clearly states "V2" intent.
License: GPLv2
@@ -27,6 +27,7 @@ Patch9: e2fsprogs-1.41.4-i_file_acl_high
Patch10: e2fsprogs-1.41.4-minimum-resize.patch
Patch11: e2fsprogs-1.41.4-update-sb-journal-backup.patch
Patch12: e2fsprogs-1.41.4-extent-open-leak.patch
+Patch13: e2fsprogs-1.41.4-dev-mapper-names.patch
Url: http://e2fsprogs.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -124,6 +125,8 @@ SMP systems.
%patch11 -p1 -b .resize_sb_backup
# Fix memory leak in extent handling
%patch12 -p1 -b .extent_leak
+# Fix devicemapper names
+%patch13 -p1 -b .devmapper_names
%build
%configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper --enable-blkid-devmapper --enable-blkid-selinux
@@ -322,6 +325,9 @@ fi
%dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
%changelog
+* Wed Jun 24 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-12
+- blkid: use /dev/mapper/<name> vs /dev/dm-<N> (#497259)
+
* Thu Jun 18 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-11
- Update journal backup blocks in sb after resize (#505339)
- Fix memory leak in extent handling functions
More information about the fedora-extras-commits
mailing list