From 945010629641b00cca95d1fed4f63009a2b4a113 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Thu, 23 Aug 2012 11:31:45 +0000 Subject: ext4: remove init_fs/deinit_fs There's no real need to expose this and it can be removed by using a static allocation. Signed-off-by: Rob Herring --- include/zfs_common.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include/zfs_common.h') diff --git a/include/zfs_common.h b/include/zfs_common.h index 04e73d0..628231e 100644 --- a/include/zfs_common.h +++ b/include/zfs_common.h @@ -94,8 +94,6 @@ struct zfs_dirhook_info { struct zfs_filesystem *zfsget_fs(void); -int init_fs(block_dev_desc_t *dev_desc); -void deinit_fs(block_dev_desc_t *dev_desc); int zfs_open(zfs_file_t, const char *filename); uint64_t zfs_read(zfs_file_t, char *buf, uint64_t len); struct zfs_data *zfs_mount(device_t); -- cgit v1.1 From 412045704477a9b4d46b7e1fddbd53ec5dcde155 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Thu, 23 Aug 2012 11:31:49 +0000 Subject: 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 --- include/zfs_common.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'include/zfs_common.h') diff --git a/include/zfs_common.h b/include/zfs_common.h index 628231e..3bd575e 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 -- cgit v1.1