korg/btrfs-progs
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git synced 2024-11-28 06:34:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: utils: introduce queue_param helper function

Browse Source 
Introduce the queue_param helper function to get a device request queue
parameter. This helper will be used later to query information of a zoned
device.

Furthermore, rewrite is_ssd() using the helper function.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
[Naohiro] fixed error return value
Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Naohiro Aota 2021-04-26 15:27:17 +09:00 committed by David Sterba
parent cf67267d33
commit c4d2704c9a
3 changed files with 48 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
common/device-utils.c
View File

@ -23,6 +23,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <blkid/blkid.h>
#include <linux/limits.h>
#include "kernel-lib/sizes.h"
#include "kernel-shared/disk-io.h"
#include "common/device-utils.h"
@ -252,3 +253,47 @@ u64 get_partition_size(const char *dev)
return result;
}
/*
* Get a device request queue parameter from sysfs.
*/
int queue_param(const char *file, const char *param, char *buf, size_t len)
{
blkid_probe probe;
char wholedisk[PATH_MAX];
char sysfs_path[PATH_MAX];
dev_t devno;
int fd;
int ret;
probe = blkid_new_probe_from_filename(file);
if (!probe)
return 0;
/* Device number of this disk (possibly a partition) */
devno = blkid_probe_get_devno(probe);
if (!devno) {
blkid_free_probe(probe);
return 0;
}
/* Get whole disk name (not full path) for this devno */
ret = blkid_devno_to_wholedisk(devno, wholedisk, sizeof(wholedisk), NULL);
if (ret) {
blkid_free_probe(probe);
return 0;
}
snprintf(sysfs_path, PATH_MAX, "/sys/block/%s/queue/%s",
wholedisk, param);
blkid_free_probe(probe);
fd = open(sysfs_path, O_RDONLY);
if (fd < 0)
return 0;
len = read(fd, buf, len);
close(fd);
return len;
}

1
common/device-utils.h
View File

@ -29,5 +29,6 @@ u64 disk_size(const char *path);
u64 btrfs_device_size(int fd, struct stat *st);
int btrfs_prepare_device(int fd, const char *file, u64 *block_count_ret,
u64 max_block_count, unsigned opflags);
int queue_param(const char *file, const char *param, char *buf, size_t len);
#endif

40
mkfs/main.c
View File

@ -433,49 +433,13 @@ static int zero_output_file(int out_fd, u64 size)
static int is_ssd(const char *file)
{
blkid_probe probe;
char wholedisk[PATH_MAX];
char sysfs_path[PATH_MAX];
dev_t devno;
int fd;
char rotational;
int ret;
probe = blkid_new_probe_from_filename(file);
if (!probe)
ret = queue_param(file, "rotational", &rotational, 1);
if (ret < 1)
return 0;
/* Device number of this disk (possibly a partition) */
devno = blkid_probe_get_devno(probe);
if (!devno) {
blkid_free_probe(probe);
return 0;
}
/* Get whole disk name (not full path) for this devno */
ret = blkid_devno_to_wholedisk(devno,
wholedisk, sizeof(wholedisk), NULL);
if (ret) {
blkid_free_probe(probe);
return 0;
}
snprintf(sysfs_path, PATH_MAX, "/sys/block/%s/queue/rotational",
wholedisk);
blkid_free_probe(probe);
fd = open(sysfs_path, O_RDONLY);
if (fd < 0) {
return 0;
}
if (read(fd, &rotational, 1) < 1) {
close(fd);
return 0;
}
close(fd);
return rotational == '0';
}