From 7f8b2bf3be6db30280bd8c5a77584350170abd11 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Fri, 10 Jun 2011 15:39:56 +0200 Subject: libmount: add mount support for loopdevs Signed-off-by: Karel Zak --- libmount/src/cache.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'libmount/src/cache.c') diff --git a/libmount/src/cache.c b/libmount/src/cache.c index 4775069c..907e048d 100644 --- a/libmount/src/cache.c +++ b/libmount/src/cache.c @@ -237,7 +237,6 @@ static int mnt_cache_get_probe(struct libmnt_cache *cache, const char *devname, blkid_probe pr = cache ? cache->pr : NULL; assert(devname); - assert(res); if (cache && cache->pr && (!cache->filename || strcmp(devname, cache->filename))) { @@ -260,7 +259,8 @@ static int mnt_cache_get_probe(struct libmnt_cache *cache, const char *devname, } - *res = pr; + if (res) + *res = pr; return 0; } @@ -277,7 +277,6 @@ static int mnt_cache_get_probe(struct libmnt_cache *cache, const char *devname, int mnt_cache_read_tags(struct libmnt_cache *cache, const char *devname) { int i, ntags = 0, rc; - blkid_probe pr; const char *tags[] = { "LABEL", "UUID", "TYPE" }; assert(cache); @@ -298,7 +297,7 @@ int mnt_cache_read_tags(struct libmnt_cache *cache, const char *devname) return 0; } - rc = mnt_cache_get_probe(cache, devname, &pr); + rc = mnt_cache_get_probe(cache, devname, NULL); if (rc) return rc; -- cgit v1.2.3