> From 85c71f8fff3e80f549342bf995b686ba7303c2b4 Mon Sep 17 00:00:00 2001 From: Richard Jones<rjones(a)redhat.com> Date: Tue, 1 Jun 2010 13:39:25 +0100 Subject: [PATCH 1/4] daemon: Generalize the implementation of vfs-type. Note that there is no change to the semantics of the code. --- daemon/blkid.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-)

> From 21c42e9fabf6cea3d564e338a314479ef120502a Mon Sep 17 00:00:00 2001 From: Richard Jones<rjones(a)redhat.com> Date: Tue, 1 Jun 2010 15:27:57 +0100 Subject: [PATCH 2/4] daemon: Kill blkid cache to improve reliability of blkid commands. By killing the cache file, we make blkid work in situations such as a just-created filesystem. --- daemon/blkid.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)

> From 27b730a6820b80a49a4da1af9f4c8e8a952f735e Mon Sep 17 00:00:00 2001 From: Richard Jones<rjones(a)redhat.com> Date: Tue, 1 Jun 2010 13:57:12 +0100 Subject: [PATCH 3/4] New APIs: vfs-label and vfs-uuid return label and uuid for many fs types. These APIs generalize the existing 'get-e2label' and 'get-e2uuid' calls, to provide calls which should be able to get the label and UUID for most filesystem types. These use 'blkid' to do the work. I have tested that the blkid commands themselves work on RHEL 5. (Suggested by Yufang Zhang). --- daemon/blkid.c | 12 ++++++++++++ src/MAX_PROC_NR | 2 +- src/generator.ml | 23 +++++++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletions(-)

> From da4812ab6b44c29cb3cf181c7aa896420ecb8aa6 Mon Sep 17 00:00:00 2001 From: Richard Jones<rjones(a)redhat.com> Date: Tue, 1 Jun 2010 14:04:51 +0100 Subject: [PATCH 4/4] Fix and deprecate get_e2label and get_e2uuid (RHBZ#597112). Fix these calls (see description in RHBZ#597112), but also deprecate them since the new calls vfs_label and vfs_uuid can work on any filesystem type. This also adds a regression test for the original bug reported in RHBZ#597112. --- daemon/ext2.c | 84 +---------------------------------------------------- src/generator.ml | 11 +++++-- 2 files changed, 10 insertions(+), 85 deletions(-)