btrfs-progs: rename and move get_device_info

The helper belongs to the device-utils, move it there and use the common
prefix.

Signed-off-by: David Sterba <[email protected]>

Author: kdave

cmds/filesystem-usage.c

@@ -776,7 +776,7 @@ static int load_device_info(int fd, struct device_info **devinfo_ret,
 			goto out;
 		}
 		memset(&dev_info, 0, sizeof(dev_info));
-		ret = get_device_info(fd, i, &dev_info);
+		ret = device_get_info(fd, i, &dev_info);
 
 		if (ret == -ENODEV)
 			continue;

common/device-utils.c

@@ -530,6 +530,17 @@ int device_get_rotational(const char *file)
 	return (rotational == '0');
 }
 
+int device_get_info(int fd, u64 devid, struct btrfs_ioctl_dev_info_args *di_args)
+{
+	int ret;
+
+	di_args->devid = devid;
+	memset(&di_args->uuid, 0, sizeof(di_args->uuid));
+	ret = ioctl(fd, BTRFS_IOC_DEV_INFO, di_args);
+
+	return ret < 0 ? -errno : 0;
+}
+
 ssize_t btrfs_direct_pread(int fd, void *buf, size_t count, off_t offset)
 {
 	int alignment;

common/device-utils.h

@@ -21,6 +21,7 @@
 #include <sys/stat.h>
 #include <stdbool.h>
 #include <unistd.h>
+#include "kernel-shared/uapi/btrfs.h"
 
 /*
  * Options for btrfs_prepare_device
@@ -45,6 +46,7 @@ int device_get_queue_param(const char *file, const char *param, char *buf, size_
 u64 device_get_zone_unusable(int fd, u64 flags);
 u64 device_get_zone_size(int fd, const char *name);
 int device_get_rotational(const char *file);
+int device_get_info(int fd, u64 devid, struct btrfs_ioctl_dev_info_args *di_args);
 /*
  * Updates to devices with btrfs-specific changs
  */

common/utils.c

@@ -34,6 +34,7 @@
 #include "kernel-shared/disk-io.h"
 #include "kernel-shared/volumes.h"
 #include "common/utils.h"
+#include "common/device-utils.h"
 #include "common/path-utils.h"
 #include "common/open-utils.h"
 #include "common/sysfs-utils.h"
@@ -67,18 +68,6 @@ void btrfs_format_csum(u16 csum_type, const u8 *data, char *output)
 	}
 }
 
-int get_device_info(int fd, u64 devid,
-		struct btrfs_ioctl_dev_info_args *di_args)
-{
-	int ret;
-
-	di_args->devid = devid;
-	memset(&di_args->uuid, '\0', sizeof(di_args->uuid));
-
-	ret = ioctl(fd, BTRFS_IOC_DEV_INFO, di_args);
-	return ret < 0 ? -errno : 0;
-}
-
 int get_df(int fd, struct btrfs_ioctl_space_args **sargs_ret)
 {
 	u64 count = 0;
@@ -281,7 +270,7 @@ int get_fs_info(const char *path, struct btrfs_ioctl_fs_info_args *fi_args,
 		 * search_chunk_tree_for_fs_info() will lacks the devid 0
 		 * so manual probe for it here.
 		 */
-		ret = get_device_info(fd, 0, &tmp);
+		ret = device_get_info(fd, 0, &tmp);
 		if (!ret) {
 			fi_args->num_devices++;
 			ndevs++;
@@ -304,7 +293,7 @@ int get_fs_info(const char *path, struct btrfs_ioctl_fs_info_args *fi_args,
 		memcpy(di_args, &tmp, sizeof(tmp));
 	for (; last_devid <= fi_args->max_id && ndevs < fi_args->num_devices;
 	     last_devid++) {
-		ret = get_device_info(fd, last_devid, &di_args[ndevs]);
+		ret = device_get_info(fd, last_devid, &di_args[ndevs]);
 		if (ret == -ENODEV)
 			continue;
 		if (ret)

common/utils.h

@@ -59,8 +59,6 @@ int ask_user(const char *question);
 int lookup_path_rootid(int fd, u64 *rootid);
 int find_mount_fsroot(const char *subvol, const char *subvolid, char **mount);
 int find_mount_root(const char *path, char **mount_root);
-int get_device_info(int fd, u64 devid,
-		struct btrfs_ioctl_dev_info_args *di_args);
 int get_df(int fd, struct btrfs_ioctl_space_args **sargs_ret);
 
 const char *subvol_strip_mountpoint(const char *mnt, const char *full_path);