summaryrefslogtreecommitdiff
path: root/include/zfs_common.h
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2012-08-23 11:31:49 +0000
committerTom Rini <trini@ti.com>2012-09-25 14:49:17 -0700
commit412045704477a9b4d46b7e1fddbd53ec5dcde155 (patch)
tree2be3c498fd374bbef140f8359d439fd18dffc3a4 /include/zfs_common.h
parent475c7970c18526adb406f8bc648c44255b300225 (diff)
cmd_zfs: use common get_device_and_partition function
Convert zfsload and zfsls to use common device and partition parsing function. With the common function "dev:part" can come from the environment and a '-' can be used in that case. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Diffstat (limited to 'include/zfs_common.h')
-rw-r--r--include/zfs_common.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/include/zfs_common.h b/include/zfs_common.h
index 628231efd3f..3bd575ef5f9 100644
--- a/include/zfs_common.h
+++ b/include/zfs_common.h
@@ -66,9 +66,6 @@ struct zfs_filesystem {
block_dev_desc_t *dev_desc;
};
-
-extern block_dev_desc_t *zfs_dev_desc;
-
struct device_s {
uint64_t part_length;
};
@@ -101,7 +98,7 @@ int zfs_close(zfs_file_t);
int zfs_ls(device_t dev, const char *path,
int (*hook) (const char *, const struct zfs_dirhook_info *));
int zfs_devread(int sector, int byte_offset, int byte_len, char *buf);
-int zfs_set_blk_dev(block_dev_desc_t *rbdd, int part);
+void zfs_set_blk_dev(block_dev_desc_t *rbdd, disk_partition_t *info);
void zfs_unmount(struct zfs_data *data);
int lzjb_decompress(void *, void *, uint32_t, uint32_t);
#endif