mirror of
https://github.com/ibm-s390-linux/s390-tools.git
synced 2026-08-05 02:14:52 +00:00
76aaf3d4a8
This patch fixes a bug in disk_get_info()
Steps to reproduce: Prepare a SCSI disk for IPL, specifying an image
("-i IMAGE_NAME") located on DASD and a target directory ("-t /mnt")
located on SCSI (dm). Don't specify "-a" option.
Actual result: Installation succeeded (resulting in unbootable setup!)
Expected result: "Error: Could not add image file 'IMAGE_NAME':
File is not on target device".
The problem is in incorrect evaluation of device number (dev_t) of
the device, where the image file is located, by the function
add_component_file_range(). To evaluate it, disk_get_info() is called
with the structure job_target_data (passed as the second argument)
previously completed by disk_get_info() called earlier to evaluate
parameters of the specified target device (SCSI dm) by the function
prepare_build_program_table_file(). Since the targetbase is already
set in the passed job_target_data (by the first call), in the second
call the source type is evaluated as "source_user", so the number of
the device where the image is located is calculated by the base SCSI
disk, which is incorrect.
Fixup: Rework disk_get_info(): introduce a dedicated function to
evaluate source type not depending on the job_target_data content.
Implement the core procedure as a switch by the evaluated source
type.
Signed-off-by: Eduard Shishkin <edward6@linux.ibm.com>
Reviewed-by: Stefan Haberland <sth@linux.ibm.com>
Signed-off-by: Steffen Eiden <seiden@linux.ibm.com>
129 lines
3.6 KiB
C
129 lines
3.6 KiB
C
/*
|
|
* s390-tools/zipl/include/disk.h
|
|
* Functions to handle disk layout specific operations.
|
|
*
|
|
* Copyright IBM Corp. 2001, 2017
|
|
*
|
|
* s390-tools is free software; you can redistribute it and/or modify
|
|
* it under the terms of the MIT license. See LICENSE for details.
|
|
*
|
|
*/
|
|
|
|
#ifndef DISK_H
|
|
#define DISK_H
|
|
|
|
#include <stdint.h>
|
|
#include <sys/types.h>
|
|
|
|
#include "zipl.h"
|
|
#include "lib/vtoc.h"
|
|
|
|
|
|
/* Type for representing disk block numbers */
|
|
typedef uint64_t blocknum_t;
|
|
|
|
/* Pointer to block on a disk with cyl/head/sec layout */
|
|
struct disk_blockptr_chs {
|
|
unsigned int cyl;
|
|
int head;
|
|
int sec;
|
|
int size;
|
|
int blockct;
|
|
};
|
|
|
|
/* Pointer to a block on a disk with linear layout */
|
|
struct disk_blockptr_linear {
|
|
blocknum_t block;
|
|
int size;
|
|
int blockct;
|
|
};
|
|
|
|
/* This represents in-memory pointer to a block on disk */
|
|
typedef union {
|
|
struct disk_blockptr_chs chs;
|
|
struct disk_blockptr_linear linear;
|
|
} disk_blockptr_t;
|
|
|
|
/* Disk type identifier */
|
|
typedef enum {
|
|
disk_type_scsi,
|
|
disk_type_fba,
|
|
disk_type_diag,
|
|
disk_type_eckd_ldl,
|
|
disk_type_eckd_cdl,
|
|
} disk_type_t;
|
|
|
|
/* targetbase definition */
|
|
typedef enum {
|
|
defined_as_device,
|
|
defined_as_name
|
|
} definition_t;
|
|
|
|
/* Disk information type */
|
|
struct disk_info {
|
|
disk_type_t type;
|
|
dev_t device;
|
|
dev_t partition;
|
|
int devno;
|
|
int partnum;
|
|
int phy_block_size;
|
|
int fs_block_size;
|
|
uint64_t phy_blocks;
|
|
struct hd_geometry geo;
|
|
char* name;
|
|
char* drv_name;
|
|
definition_t targetbase;
|
|
int is_nvme;
|
|
};
|
|
|
|
struct file_range {
|
|
off_t offset;
|
|
size_t len;
|
|
};
|
|
|
|
struct job_target_data;
|
|
|
|
int disk_get_info(const char* device, struct job_target_data* target,
|
|
struct disk_info** info);
|
|
int disk_is_tape(const char* device);
|
|
int disk_is_scsi(const char* device, struct job_target_data* target);
|
|
int disk_is_eckd_ldl(const char* device, struct job_target_data* target);
|
|
int disk_is_nvme(const char* device, struct job_target_data* target);
|
|
int disk_get_info_from_file(const char* filename,
|
|
struct job_target_data* target,
|
|
struct disk_info** info);
|
|
void disk_free_info(struct disk_info* info);
|
|
char* disk_get_type_name(disk_type_t type);
|
|
char *disk_get_ipl_type(disk_type_t type, int is_dump);
|
|
int disk_is_large_volume(struct disk_info* info);
|
|
int disk_cyl_from_blocknum(blocknum_t blocknum, struct disk_info* info);
|
|
int disk_head_from_blocknum(blocknum_t blocknum, struct disk_info* info);
|
|
int disk_sec_from_blocknum(blocknum_t blocknum, struct disk_info* info);
|
|
void disk_blockptr_from_blocknum(disk_blockptr_t* ptr, blocknum_t blocknum,
|
|
struct disk_info* info);
|
|
int disk_write_block_aligned(int fd, const void* data, size_t bytecount,
|
|
disk_blockptr_t* block, struct disk_info* info);
|
|
blocknum_t disk_write_block_buffer(int fd, int fd_is_basedisk,
|
|
const void* buffer, size_t bytecount,
|
|
disk_blockptr_t** blocklist,
|
|
struct disk_info *info);
|
|
blocknum_t disk_write_block_buffer_align(int fd, int fd_is_basedisk,
|
|
const void *buffer, size_t bytecount,
|
|
disk_blockptr_t **blocklist,
|
|
struct disk_info *info, int align,
|
|
off_t *offset);
|
|
void disk_print_devt(dev_t d);
|
|
void disk_print_info(struct disk_info *info, int source);
|
|
int disk_is_zero_block(disk_blockptr_t* block, struct disk_info* info);
|
|
blocknum_t disk_compact_blocklist(disk_blockptr_t* list, blocknum_t count,
|
|
struct disk_info* info);
|
|
blocknum_t disk_get_blocklist_from_file(const char* filename,
|
|
struct file_range *reg,
|
|
disk_blockptr_t** blocklist,
|
|
struct disk_info* pinfo);
|
|
int disk_check_subchannel_set(int devno, dev_t device, char* dev_name);
|
|
void disk_print_geo(struct disk_info *data);
|
|
int fs_map(int fd, uint64_t offset, blocknum_t *mapped, int fs_block_size);
|
|
|
|
#endif /* not DISK_H */
|