cmd_reiser: use common get_device_and_partition function
Convert reiserload and reiserls 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>
This commit is contained in:
Rob Herring
Tom Rini
parent
4120457044
commit
650f36641c
|
|
@ -50,43 +50,27 @@
|
|||
int do_reiserls (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
||||
{
|
||||
char *filename = "/";
|
||||
int dev=0;
|
||||
int part=1;
|
||||
char *ep;
|
||||
int dev, part;
|
||||
block_dev_desc_t *dev_desc=NULL;
|
||||
int part_length;
|
||||
disk_partition_t info;
|
||||
|
||||
if (argc < 3)
|
||||
return CMD_RET_USAGE;
|
||||
|
||||
dev = (int)simple_strtoul (argv[2], &ep, 16);
|
||||
dev_desc = get_dev(argv[1],dev);
|
||||
|
||||
if (dev_desc == NULL) {
|
||||
printf ("\n** Block device %s %d not supported\n", argv[1], dev);
|
||||
part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info);
|
||||
if (part < 0)
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (*ep) {
|
||||
if (*ep != ':') {
|
||||
puts ("\n** Invalid boot device, use `dev[:part]' **\n");
|
||||
return 1;
|
||||
}
|
||||
part = (int)simple_strtoul(++ep, NULL, 16);
|
||||
}
|
||||
|
||||
if (argc == 4) {
|
||||
filename = argv[3];
|
||||
}
|
||||
|
||||
dev = dev_desc->dev;
|
||||
PRINTF("Using device %s %d:%d, directory: %s\n", argv[1], dev, part, filename);
|
||||
|
||||
if ((part_length = reiserfs_set_blk_dev(dev_desc, part)) == 0) {
|
||||
printf ("** Bad partition - %s %d:%d **\n", argv[1], dev, part);
|
||||
return 1;
|
||||
}
|
||||
reiserfs_set_blk_dev(dev_desc, &info);
|
||||
|
||||
if (!reiserfs_mount(part_length)) {
|
||||
if (!reiserfs_mount(info.size)) {
|
||||
printf ("** Bad Reiserfs partition or disk - %s %d:%d **\n", argv[1], dev, part);
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -112,9 +96,8 @@ U_BOOT_CMD(
|
|||
int do_reiserload (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
||||
{
|
||||
char *filename = NULL;
|
||||
char *ep;
|
||||
int dev, part = 0;
|
||||
ulong addr = 0, part_length, filelen;
|
||||
int dev, part;
|
||||
ulong addr = 0, filelen;
|
||||
disk_partition_t info;
|
||||
block_dev_desc_t *dev_desc = NULL;
|
||||
char buf [12];
|
||||
|
|
@ -157,49 +140,19 @@ int do_reiserload (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|||
return 1;
|
||||
}
|
||||
|
||||
dev = (int)simple_strtoul (argv[2], &ep, 16);
|
||||
dev_desc = get_dev(argv[1],dev);
|
||||
if (dev_desc==NULL) {
|
||||
printf ("\n** Block device %s %d not supported\n", argv[1], dev);
|
||||
part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info);
|
||||
if (part < 0)
|
||||
return 1;
|
||||
}
|
||||
if (*ep) {
|
||||
if (*ep != ':') {
|
||||
puts ("\n** Invalid boot device, use `dev[:part]' **\n");
|
||||
return 1;
|
||||
}
|
||||
part = (int)simple_strtoul(++ep, NULL, 16);
|
||||
}
|
||||
|
||||
PRINTF("Using device %s%d, partition %d\n", argv[1], dev, part);
|
||||
dev = dev_desc->dev;
|
||||
|
||||
if (part != 0) {
|
||||
if (get_partition_info (dev_desc, part, &info)) {
|
||||
printf ("** Bad partition %d **\n", part);
|
||||
return 1;
|
||||
}
|
||||
printf("Loading file \"%s\" from %s device %d%c%c\n",
|
||||
filename, argv[1], dev,
|
||||
part ? ':' : ' ', part ? part + '0' : ' ');
|
||||
|
||||
if (strncmp((char *)info.type, BOOT_PART_TYPE, sizeof(info.type)) != 0) {
|
||||
printf ("\n** Invalid partition type \"%.32s\""
|
||||
" (expect \"" BOOT_PART_TYPE "\")\n",
|
||||
info.type);
|
||||
return 1;
|
||||
}
|
||||
PRINTF ("\nLoading from block device %s device %d, partition %d: "
|
||||
"Name: %.32s Type: %.32s File:%s\n",
|
||||
argv[1], dev, part, info.name, info.type, filename);
|
||||
} else {
|
||||
PRINTF ("\nLoading from block device %s device %d, File:%s\n",
|
||||
argv[1], dev, filename);
|
||||
}
|
||||
reiserfs_set_blk_dev(dev_desc, &info);
|
||||
|
||||
|
||||
if ((part_length = reiserfs_set_blk_dev(dev_desc, part)) == 0) {
|
||||
printf ("** Bad partition - %s %d:%d **\n", argv[1], dev, part);
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (!reiserfs_mount(part_length)) {
|
||||
if (!reiserfs_mount(info.size)) {
|
||||
printf ("** Bad Reiserfs partition or disk - %s %d:%d **\n", argv[1], dev, part);
|
||||
return 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,24 +25,13 @@
|
|||
#include "reiserfs_private.h"
|
||||
|
||||
static block_dev_desc_t *reiserfs_block_dev_desc;
|
||||
static disk_partition_t part_info;
|
||||
static disk_partition_t *part_info;
|
||||
|
||||
|
||||
int reiserfs_set_blk_dev(block_dev_desc_t *rbdd, int part)
|
||||
void reiserfs_set_blk_dev(block_dev_desc_t *rbdd, disk_partition_t *info)
|
||||
{
|
||||
reiserfs_block_dev_desc = rbdd;
|
||||
|
||||
if (part == 0) {
|
||||
/* disk doesn't use partition table */
|
||||
part_info.start = 0;
|
||||
part_info.size = rbdd->lba;
|
||||
part_info.blksz = rbdd->blksz;
|
||||
} else {
|
||||
if (get_partition_info (reiserfs_block_dev_desc, part, &part_info)) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return (part_info.size);
|
||||
part_info = info;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -59,7 +48,7 @@ int reiserfs_devread (int sector, int byte_offset, int byte_len, char *buf)
|
|||
*/
|
||||
if (sector < 0
|
||||
|| ((sector + ((byte_offset + byte_len - 1) >> SECTOR_BITS))
|
||||
>= part_info.size)) {
|
||||
>= part_info->size)) {
|
||||
/* errnum = ERR_OUTSIDE_PART; */
|
||||
printf (" ** reiserfs_devread() read outside partition\n");
|
||||
return 0;
|
||||
|
|
@ -83,7 +72,8 @@ int reiserfs_devread (int sector, int byte_offset, int byte_len, char *buf)
|
|||
if (byte_offset != 0) {
|
||||
/* read first part which isn't aligned with start of sector */
|
||||
if (reiserfs_block_dev_desc->block_read(reiserfs_block_dev_desc->dev,
|
||||
part_info.start+sector, 1, (unsigned long *)sec_buf) != 1) {
|
||||
part_info->start + sector, 1,
|
||||
(unsigned long *)sec_buf) != 1) {
|
||||
printf (" ** reiserfs_devread() read error\n");
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -96,8 +86,8 @@ int reiserfs_devread (int sector, int byte_offset, int byte_len, char *buf)
|
|||
/* read sector aligned part */
|
||||
block_len = byte_len & ~(SECTOR_SIZE-1);
|
||||
if (reiserfs_block_dev_desc->block_read(reiserfs_block_dev_desc->dev,
|
||||
part_info.start+sector, block_len/SECTOR_SIZE, (unsigned long *)buf) !=
|
||||
block_len/SECTOR_SIZE) {
|
||||
part_info->start + sector, block_len/SECTOR_SIZE,
|
||||
(unsigned long *)buf) != block_len/SECTOR_SIZE) {
|
||||
printf (" ** reiserfs_devread() read error - block\n");
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -108,7 +98,8 @@ int reiserfs_devread (int sector, int byte_offset, int byte_len, char *buf)
|
|||
if ( byte_len != 0 ) {
|
||||
/* read rest of data which are not in whole sector */
|
||||
if (reiserfs_block_dev_desc->block_read(reiserfs_block_dev_desc->dev,
|
||||
part_info.start+sector, 1, (unsigned long *)sec_buf) != 1) {
|
||||
part_info->start + sector, 1,
|
||||
(unsigned long *)sec_buf) != 1) {
|
||||
printf (" ** reiserfs_devread() read error - last part\n");
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ typedef enum
|
|||
} reiserfs_error_t;
|
||||
|
||||
|
||||
extern int reiserfs_set_blk_dev(block_dev_desc_t *rbdd, int part);
|
||||
extern void reiserfs_set_blk_dev(block_dev_desc_t *rbdd, disk_partition_t *info);
|
||||
extern int reiserfs_ls (char *dirname);
|
||||
extern int reiserfs_open (char *filename);
|
||||
extern int reiserfs_read (char *buf, unsigned len);
|
||||
|
|
|
|||
Loading…
Reference in New Issue