From 8c291e67c5c30bd75a8639f04dfcb4168e939930 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sun, 13 Aug 2006 11:55:13 +0000 Subject: r17520: If the blkid library fails, I don't see any reason to return more of an error than if we don't have it. We might not be on a volume that can store/return such a GUID. (Try to fix one of the build farm failures). Andrew Bartlett (This used to be commit 73d6651f3c06d0d3bbfd9fe1a9d0f76fe19ba4af) --- source4/ntvfs/posix/pvfs_fsinfo.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'source4') diff --git a/source4/ntvfs/posix/pvfs_fsinfo.c b/source4/ntvfs/posix/pvfs_fsinfo.c index 1a7ad16776..c1df33be18 100644 --- a/source4/ntvfs/posix/pvfs_fsinfo.c +++ b/source4/ntvfs/posix/pvfs_fsinfo.c @@ -39,19 +39,22 @@ static NTSTATUS pvfs_blkid_fs_uuid(struct pvfs_state *pvfs, struct stat *st, str devname = blkid_devno_to_devname(st->st_dev); if (!devname) { - return NT_STATUS_DEVICE_CONFIGURATION_ERROR; + ZERO_STRUCTP(uuid); + return NT_STATUS_OK; } uuid_value = blkid_get_tag_value(NULL, "UUID", devname); free(devname); if (!uuid_value) { - return NT_STATUS_DEVICE_CONFIGURATION_ERROR; + ZERO_STRUCTP(uuid); + return NT_STATUS_OK; } status = GUID_from_string(uuid_value, uuid); free(uuid_value); if (!NT_STATUS_IS_OK(status)) { - return NT_STATUS_DEVICE_CONFIGURATION_ERROR; + ZERO_STRUCTP(uuid); + return NT_STATUS_OK; } return NT_STATUS_OK; #else -- cgit