storage: Switch metadata crawler to use storage driver file access check

Use virStorageFileAccess() to to check whether the file is accessible in
the main part of the metadata crawler.
This commit is contained in:
Peter Krempa 2014-04-28 08:44:42 +02:00
parent 2bdb8b965b
commit 6cdff20c2a

View File

@ -3103,13 +3103,6 @@ virFindBackingFile(const char *start, const char *path,
goto cleanup;
}
if (virFileAccessibleAs(combined, F_OK, geteuid(), getegid()) < 0) {
virReportSystemError(errno,
_("Cannot access backing file '%s'"),
combined);
goto cleanup;
}
if (!(*canonical = canonicalize_file_name(combined))) {
virReportSystemError(errno,
_("Can't canonicalize path '%s'"), path);
@ -3151,6 +3144,13 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
if (virStorageFileInitAs(src, uid, gid) < 0)
return -1;
if (virStorageFileAccess(src, F_OK) < 0) {
virReportSystemError(errno,
_("Cannot access backing file %s"),
src->path);
goto cleanup;
}
if (!(uniqueName = virStorageFileGetUniqueIdentifier(src)))
goto cleanup;