picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

shared/sleep: use stat() instead of open()+fstat() in one place

Browse source 
No functional change.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-01-07 16:20:35 +01:00
parent 52133271a7
commit e9f0c5d08c
1 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/shared/sleep-config.c
View file

@ -186,36 +186,25 @@ HibernateLocation* hibernate_location_free(HibernateLocation *hl) {
}
static int swap_device_to_device_id(const SwapEntry *swap, dev_t *ret_dev) {
_cleanup_close_ int fd = -1;
struct stat sb;
dev_t swap_dev;
int r;
assert(swap);
assert(swap->device);
assert(swap->type);
fd = open(swap->device, O_RDONLY | O_CLOEXEC | O_NONBLOCK);
if (fd < 0)
return log_debug_errno(errno, "Unable to open '%s': %m", swap->device);
r = fstat(fd, &sb);
r = stat(swap->device, &sb);
if (r < 0)
return log_debug_errno(errno, "Unable to stat %s: %m", swap->device);
if (streq(swap->type, "partition")) {
if(!S_ISBLK(sb.st_mode))
if (!S_ISBLK(sb.st_mode))
return -ENOTBLK;
swap_dev = sb.st_rdev;
} else {
r = get_block_device(swap->device, &swap_dev);
if (r < 0)
return r;
}
*ret_dev = sb.st_rdev;
return 0;
*ret_dev = swap_dev;
return 0;
} else
return get_block_device(swap->device, ret_dev);
}
/*