External/libvirt
1
0
Fork 0
Code

util: reduce syscalls for virGetDeviceID

Browse Source 
There's no need to do lots of readlink() calls to canonicalize
a name if we're only going to use stat() on it, since stat()
already chases symlinks.

* src/util/virutil.c (virGetDeviceID): Let stat() do the symlink
chasing.
This commit is contained in:
Eric Blake 2013-01-09 16:34:15 -07:00
parent 66b4693269
commit 9f2879d311
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/util/virutil.c
View File

@ -1,7 +1,7 @@
/* /*
* virutil.c: common, generic utility functions * virutil.c: common, generic utility functions
* *
* Copyright (C) 2006-2012 Red Hat, Inc. * Copyright (C) 2006-2013 Red Hat, Inc.
* Copyright (C) 2006 Daniel P. Berrange * Copyright (C) 2006 Daniel P. Berrange
* Copyright (C) 2006, 2007 Binary Karma * Copyright (C) 2006, 2007 Binary Karma
* Copyright (C) 2006 Shuveb Hussain * Copyright (C) 2006 Shuveb Hussain
@ -3135,27 +3135,18 @@ int
virGetDeviceID(const char *path, int *maj, int *min) virGetDeviceID(const char *path, int *maj, int *min)
{ {
struct stat sb; struct stat sb;
char *canonical_path = NULL;
if (virFileResolveLink(path, &canonical_path) < 0) if (stat(path, &sb) < 0)
return -errno; return -errno;
if (stat(canonical_path, &sb) < 0) { if (!S_ISBLK(sb.st_mode))
VIR_FREE(canonical_path);
return -errno;
}
if (!S_ISBLK(sb.st_mode)) {
VIR_FREE(canonical_path);
return -EINVAL; return -EINVAL;
}
if (maj) if (maj)
*maj = major(sb.st_rdev); *maj = major(sb.st_rdev);
if (min) if (min)
*min = minor(sb.st_rdev); *min = minor(sb.st_rdev);
VIR_FREE(canonical_path);
return 0; return 0;
} }
#else #else