minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-11 13:08:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

ext4: remove init_fs/deinit_fs

Browse Source 
There's no real need to expose this and it can be removed by using a static
allocation.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
This commit is contained in:
Rob Herring 2012-08-23 11:31:45 +00:00 committed by Tom Rini
parent 99d2c205d4
commit 9450106296
5 changed files with 8 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/cmd_ext4.c
View File

@ -151,8 +151,6 @@ int do_ext4_write(cmd_tbl_t *cmdtp, int flag, int argc,
printf("Block device %s %d not supported\n", argv[1], dev); printf("Block device %s %d not supported\n", argv[1], dev);
return 1; return 1;
} }
if (init_fs(ext4_dev_desc))
return 1;
fs = get_fs(); fs = get_fs();
if (*ep) { if (*ep) {
@ -173,21 +171,21 @@ int do_ext4_write(cmd_tbl_t *cmdtp, int flag, int argc,
file_size = simple_strtoul(argv[5], NULL, 10); file_size = simple_strtoul(argv[5], NULL, 10);
/* set the device as block device */ /* set the device as block device */
part_length = ext4fs_set_blk_dev(fs->dev_desc, part); part_length = ext4fs_set_blk_dev(ext4_dev_desc, part);
if (part_length == 0) { if (part_length == 0) {
printf("Bad partition - %s %d:%lu\n", argv[1], dev, part); printf("Bad partition - %s %d:%lu\n", argv[1], dev, part);
goto fail; goto fail;
} }
/* register the device and partition */ /* register the device and partition */
if (ext4_register_device(fs->dev_desc, part) != 0) { if (ext4_register_device(ext4_dev_desc, part) != 0) {
printf("Unable to use %s %d:%lu for fattable\n", printf("Unable to use %s %d:%lu for fattable\n",
argv[1], dev, part); argv[1], dev, part);
goto fail; goto fail;
} }
/* get the partition information */ /* get the partition information */
if (!get_partition_info(fs->dev_desc, part, &info)) { if (!get_partition_info(ext4_dev_desc, part, &info)) {
total_sector = (info.size * info.blksz) / SECTOR_SIZE; total_sector = (info.size * info.blksz) / SECTOR_SIZE;
fs->total_sect = total_sector; fs->total_sect = total_sector;
} else { } else {
@ -207,13 +205,11 @@ int do_ext4_write(cmd_tbl_t *cmdtp, int flag, int argc,
goto fail; goto fail;
} }
ext4fs_close(); ext4fs_close();
deinit_fs(fs->dev_desc);
return 0; return 0;
fail: fail:
ext4fs_close(); ext4fs_close();
deinit_fs(fs->dev_desc);
return 1; return 1;
} }

19
common/cmd_ext_common.c
View File

@ -75,7 +75,6 @@ int do_ext_load(cmd_tbl_t *cmdtp, int flag, int argc,
ulong part_length; ulong part_length;
int filelen; int filelen;
disk_partition_t info; disk_partition_t info;
struct ext_filesystem *fs;
char buf[12]; char buf[12];
unsigned long count; unsigned long count;
const char *addr_str; const char *addr_str;
@ -117,10 +116,7 @@ int do_ext_load(cmd_tbl_t *cmdtp, int flag, int argc,
printf("** Block device %s %d not supported\n", argv[1], dev); printf("** Block device %s %d not supported\n", argv[1], dev);
return 1; return 1;
} }
if (init_fs(ext4_dev_desc))
return 1;
fs = get_fs();
if (*ep) { if (*ep) {
if (*ep != ':') { if (*ep != ':') {
puts("** Invalid boot device, use `dev[:part]' **\n"); puts("** Invalid boot device, use `dev[:part]' **\n");
@ -130,7 +126,7 @@ int do_ext_load(cmd_tbl_t *cmdtp, int flag, int argc,
} }
if (part != 0) { if (part != 0) {
if (get_partition_info(fs->dev_desc, part, &info)) { if (get_partition_info(ext4_dev_desc, part, &info)) {
printf("** Bad partition %lu **\n", part); printf("** Bad partition %lu **\n", part);
goto fail; goto fail;
} }
@ -149,7 +145,7 @@ int do_ext_load(cmd_tbl_t *cmdtp, int flag, int argc,
filename, argv[1], dev); filename, argv[1], dev);
} }
part_length = ext4fs_set_blk_dev(fs->dev_desc, part); part_length = ext4fs_set_blk_dev(ext4_dev_desc, part);
if (part_length == 0) { if (part_length == 0) {
printf("**Bad partition - %s %d:%lu **\n", argv[1], dev, part); printf("**Bad partition - %s %d:%lu **\n", argv[1], dev, part);
ext4fs_close(); ext4fs_close();
@ -180,7 +176,6 @@ int do_ext_load(cmd_tbl_t *cmdtp, int flag, int argc,
} }
ext4fs_close(); ext4fs_close();
deinit_fs(fs->dev_desc);
/* Loading ok, update default load address */ /* Loading ok, update default load address */
load_addr = addr; load_addr = addr;
@ -190,7 +185,6 @@ int do_ext_load(cmd_tbl_t *cmdtp, int flag, int argc,
return 0; return 0;
fail: fail:
deinit_fs(fs->dev_desc);
return 1; return 1;
} }
@ -200,7 +194,6 @@ int do_ext_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
int dev; int dev;
unsigned long part = 1; unsigned long part = 1;
char *ep; char *ep;
struct ext_filesystem *fs;
int part_length; int part_length;
if (argc < 3) if (argc < 3)
return cmd_usage(cmdtp); return cmd_usage(cmdtp);
@ -214,10 +207,6 @@ int do_ext_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
return 1; return 1;
} }
if (init_fs(ext4_dev_desc))
return 1;
fs = get_fs();
if (*ep) { if (*ep) {
if (*ep != ':') { if (*ep != ':') {
puts("\n** Invalid boot device, use `dev[:part]' **\n"); puts("\n** Invalid boot device, use `dev[:part]' **\n");
@ -229,7 +218,7 @@ int do_ext_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
if (argc == 4) if (argc == 4)
filename = argv[3]; filename = argv[3];
part_length = ext4fs_set_blk_dev(fs->dev_desc, part); part_length = ext4fs_set_blk_dev(ext4_dev_desc, part);
if (part_length == 0) { if (part_length == 0) {
printf("** Bad partition - %s %d:%lu **\n", argv[1], dev, part); printf("** Bad partition - %s %d:%lu **\n", argv[1], dev, part);
ext4fs_close(); ext4fs_close();
@ -250,10 +239,8 @@ int do_ext_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
}; };
ext4fs_close(); ext4fs_close();
deinit_fs(fs->dev_desc);
return 0; return 0;
fail: fail:
deinit_fs(fs->dev_desc);
return 1; return 1;
} }

36
fs/ext4/ext4fs.c
View File

@ -44,43 +44,11 @@
int ext4fs_symlinknest; int ext4fs_symlinknest;
block_dev_desc_t *ext4_dev_desc; block_dev_desc_t *ext4_dev_desc;
struct ext_filesystem ext_fs;
struct ext_filesystem *get_fs(void) struct ext_filesystem *get_fs(void)
{ {
if (ext4_dev_desc == NULL || ext4_dev_desc->priv == NULL) return &ext_fs;
printf("Invalid Input Arguments %s\n", __func__);
return ext4_dev_desc->priv;
}
int init_fs(block_dev_desc_t *dev_desc)
{
struct ext_filesystem *fs;
if (dev_desc == NULL) {
printf("Invalid Input Arguments %s\n", __func__);
return -EINVAL;
}
fs = zalloc(sizeof(struct ext_filesystem));
if (fs == NULL) {
printf("malloc failed: %s\n", __func__);
return -ENOMEM;
}
fs->dev_desc = dev_desc;
dev_desc->priv = fs;
return 0;
}
void deinit_fs(block_dev_desc_t *dev_desc)
{
if (dev_desc == NULL) {
printf("Invalid Input Arguments %s\n", __func__);
return;
}
free(dev_desc->priv);
dev_desc->priv = NULL;
} }
void ext4fs_free_node(struct ext2fs_node *node, struct ext2fs_node *currroot) void ext4fs_free_node(struct ext2fs_node *node, struct ext2fs_node *currroot)

2
include/ext4fs.h
View File

@ -130,8 +130,6 @@ int ext4fs_write(const char *fname, unsigned char *buffer,
#endif #endif
struct ext_filesystem *get_fs(void); struct ext_filesystem *get_fs(void);
int init_fs(block_dev_desc_t *dev_desc);
void deinit_fs(block_dev_desc_t *dev_desc);
int ext4fs_open(const char *filename); int ext4fs_open(const char *filename);
int ext4fs_read(char *buf, unsigned len); int ext4fs_read(char *buf, unsigned len);
int ext4fs_mount(unsigned part_length); int ext4fs_mount(unsigned part_length);

2
include/zfs_common.h
View File

@ -94,8 +94,6 @@ struct zfs_dirhook_info {
struct zfs_filesystem *zfsget_fs(void); 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); int zfs_open(zfs_file_t, const char *filename);
uint64_t zfs_read(zfs_file_t, char *buf, uint64_t len); uint64_t zfs_read(zfs_file_t, char *buf, uint64_t len);
struct zfs_data *zfs_mount(device_t); struct zfs_data *zfs_mount(device_t);