diff options
| author | Karel Zak | 2009-09-14 23:33:01 +0200 |
|---|---|---|
| committer | Karel Zak | 2009-09-16 10:57:24 +0200 |
| commit | 1b780848b0db32b972dc542a2e86aed9127599a1 (patch) | |
| tree | e3f331b9caf31bf733801d51eecdf8905a4a5506 /shlibs/blkid/src/verify.c | |
| parent | libblkid: refresh blkid.{h,sym} (diff) | |
| download | kernel-qcow2-util-linux-1b780848b0db32b972dc542a2e86aed9127599a1.tar.gz kernel-qcow2-util-linux-1b780848b0db32b972dc542a2e86aed9127599a1.tar.xz kernel-qcow2-util-linux-1b780848b0db32b972dc542a2e86aed9127599a1.zip | |
libblkid: use the new API in whole u-l-ng
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'shlibs/blkid/src/verify.c')
| -rw-r--r-- | shlibs/blkid/src/verify.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/shlibs/blkid/src/verify.c b/shlibs/blkid/src/verify.c index 78dafe7e6..273602600 100644 --- a/shlibs/blkid/src/verify.c +++ b/shlibs/blkid/src/verify.c @@ -110,9 +110,11 @@ blkid_dev blkid_verify(blkid_cache cache, blkid_dev dev) return NULL; } - blkid_probe_set_request(cache->probe, - BLKID_PROBREQ_LABEL | BLKID_PROBREQ_UUID | - BLKID_PROBREQ_TYPE | BLKID_PROBREQ_SECTYPE); + blkid_probe_enable_superblocks(cache->probe, TRUE); + + blkid_probe_set_superblocks_flags(cache->probe, + BLKID_SUBLKS_LABEL | BLKID_SUBLKS_UUID | + BLKID_SUBLKS_TYPE | BLKID_SUBLKS_SECTYPE); /* * If we already know the type, then try that first. @@ -124,12 +126,12 @@ blkid_dev blkid_verify(blkid_cache cache, blkid_dev dev) fltr[0] = dev->bid_type; fltr[1] = NULL; - blkid_probe_filter_types(cache->probe, + blkid_probe_filter_superblocks_type(cache->probe, BLKID_FLTR_ONLYIN, fltr); if (!blkid_do_probe(cache->probe)) goto found_type; - blkid_probe_invert_filter(cache->probe); + blkid_probe_invert_superblocks_filter(cache->probe); /* * Zap the device filesystem information and try again @@ -166,7 +168,7 @@ found_type: } blkid_reset_probe(cache->probe); - blkid_probe_reset_filter(cache->probe); + blkid_probe_reset_superblocks_filter(cache->probe); close(fd); return dev; } |