Commit 4cd5b9f6 authored by Peter Oberparleiter's avatar Peter Oberparleiter Committed by Linus Torvalds
Browse files

[PATCH] s390: cleanup of include/asm-s390/vtoc.h 



Signed-off-by: default avatarPeter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1e0291ba

fs/partitions/ibm.c

+8 −7
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
 * cyl-cyl-head-head structure

 */

static inline int

cchh2blk (cchh_t *ptr, struct hd_geometry *geo) {

cchh2blk (struct vtoc_cchh *ptr, struct hd_geometry *geo) {

        return ptr->cc * geo->heads * geo->sectors +

	       ptr->hh * geo->sectors;

}
@@ -40,7 +40,7 @@ cchh2blk (cchh_t *ptr, struct hd_geometry *geo) { 
 * cyl-cyl-head-head-block structure

 */

static inline int

cchhb2blk (cchhb_t *ptr, struct hd_geometry *geo) {

cchhb2blk (struct vtoc_cchhb *ptr, struct hd_geometry *geo) {

        return ptr->cc * geo->heads * geo->sectors +

		ptr->hh * geo->sectors +

		ptr->b;
@@ -56,7 +56,7 @@ ibm_partition(struct parsed_partitions *state, struct block_device *bdev) 
	struct hd_geometry *geo;

	char type[5] = {0,};

	char name[7] = {0,};

	volume_label_t *vlabel;

	struct vtoc_volume_label *vlabel;

	unsigned char *data;

	Sector sect;
@@ -64,7 +64,8 @@ ibm_partition(struct parsed_partitions *state, struct block_device *bdev) 
		goto out_noinfo;

	if ((geo = kmalloc(sizeof(struct hd_geometry), GFP_KERNEL)) == NULL)

		goto out_nogeo;

	if ((vlabel = kmalloc(sizeof(volume_label_t), GFP_KERNEL)) == NULL)

	if ((vlabel = kmalloc(sizeof(struct vtoc_volume_label),

			      GFP_KERNEL)) == NULL)

		goto out_novlab;

	

	if (ioctl_by_bdev(bdev, BIODASDINFO, (unsigned long)info) != 0 ||
@@ -86,7 +87,7 @@ ibm_partition(struct parsed_partitions *state, struct block_device *bdev) 
		strncpy(name, data + 8, 6);

	else

		strncpy(name, data + 4, 6);

	memcpy (vlabel, data, sizeof(volume_label_t));

	memcpy (vlabel, data, sizeof(struct vtoc_volume_label));

	put_dev_sector(sect);



	EBCASC(type, 4);
@@ -129,9 +130,9 @@ ibm_partition(struct parsed_partitions *state, struct block_device *bdev) 
		counter = 0;

		while ((data = read_dev_sector(bdev, blk*(blocksize/512),

					       &sect)) != NULL) {

			format1_label_t f1;

			struct vtoc_format1_label f1;



			memcpy(&f1, data, sizeof(format1_label_t));

			memcpy(&f1, data, sizeof(struct vtoc_format1_label));

			put_dev_sector(sect);



			/* skip FMT4 / FMT5 / FMT7 labels */

include/asm-s390/vtoc.h

+156 −349
Original line number Diff line number Diff line 
#ifndef __KERNEL__

#include <string.h>

#include <stdlib.h>

#include <stdio.h>

#include <errno.h>

#include <ctype.h>

#include <time.h>

#include <fcntl.h>

#include <unistd.h>

/*

 * include/asm-s390/vtoc.h

 *

 * This file contains volume label definitions for DASD devices.

 *

 * (C) Copyright IBM Corp. 2005

 *

 * Author(s): Volker Sameske <sameske@de.ibm.com>

 *

 */



#ifndef _ASM_S390_VTOC_H

#define _ASM_S390_VTOC_H



#include <sys/stat.h>

#include <sys/ioctl.h>



#include <linux/fs.h>

#include <linux/types.h>

#include <linux/hdreg.h>

#include <asm/dasd.h>

#endif





#define LINE_LENGTH 80

#define VTOC_START_CC 0x0

#define VTOC_START_HH 0x1

#define FIRST_USABLE_CYL 1

#define FIRST_USABLE_TRK 2



#define DASD_3380_TYPE 13148

#define DASD_3390_TYPE 13200

#define DASD_9345_TYPE 37701



#define DASD_3380_VALUE 0xbb60

#define DASD_3390_VALUE 0xe5a2

#define DASD_9345_VALUE 0xbc98



#define VOLSER_LENGTH 6

#define BIG_DISK_SIZE 0x10000



#define VTOC_ERROR "VTOC error:"





typedef struct ttr 

struct vtoc_ttr

{

	__u16 tt;

	__u8 r;

} __attribute__ ((packed)) ttr_t;

} __attribute__ ((packed));



typedef struct cchhb 

struct vtoc_cchhb

{

	__u16 cc;

	__u16 hh;

	__u8 b;

} __attribute__ ((packed)) cchhb_t;

} __attribute__ ((packed));



typedef struct cchh 

struct vtoc_cchh

{

	__u16 cc;

	__u16 hh;

} __attribute__ ((packed)) cchh_t;

} __attribute__ ((packed));



typedef struct labeldate 

struct vtoc_labeldate

{

	__u8 year;

	__u16 day;

} __attribute__ ((packed)) labeldate_t;



} __attribute__ ((packed));



typedef struct volume_label 

struct vtoc_volume_label

{

	char volkey[4];		/* volume key = volume label */

	char vollbl[4];		/* volume label */

	char volid[6];		/* volume identifier */

	__u8 security;		/* security byte */

	cchhb_t vtoc;           /* VTOC address                              */

	struct vtoc_cchhb vtoc;	/* VTOC address */

	char res1[5];		/* reserved */

	char cisize[4];		/* CI-size for FBA,... */

				/* ...blanks for CKD */
@@ -79,19 +54,17 @@ typedef struct volume_label 
	char res2[4];		/* reserved */

	char lvtoc[14];		/* owner code for LVTOC */

	char res3[29];		/* reserved */

} __attribute__ ((packed)) volume_label_t;

} __attribute__ ((packed));





typedef struct extent 

struct vtoc_extent

{

	__u8 typeind;			/* extent type indicator */

	__u8 seqno;			/* extent sequence number */

        cchh_t llimit;          /* starting point of this extent             */

        cchh_t ulimit;          /* ending point of this extent               */

} __attribute__ ((packed)) extent_t;



	struct vtoc_cchh llimit;	/* starting point of this extent */

	struct vtoc_cchh ulimit;	/* ending point of this extent */

} __attribute__ ((packed));



typedef struct dev_const 

struct vtoc_dev_const

{

	__u16 DS4DSCYL;	/* number of logical cyls */

	__u16 DS4DSTRK;	/* number of tracks in a logical cylinder */
@@ -103,22 +76,21 @@ typedef struct dev_const 
	__u16 DS4DEVTL;	/* device tolerance */

	__u8 DS4DEVDT;	/* number of DSCB's per track */

	__u8 DS4DEVDB;	/* number of directory blocks per track */

} __attribute__ ((packed)) dev_const_t;

} __attribute__ ((packed));





typedef struct format1_label 

struct vtoc_format1_label

{

	char DS1DSNAM[44];	/* data set name */

	__u8 DS1FMTID;		/* format identifier */

	char DS1DSSN[6];	/* data set serial number */

	__u16 DS1VOLSQ;		/* volume sequence number */

	labeldate_t DS1CREDT;     /* creation date: ydd                      */

	labeldate_t DS1EXPDT;     /* expiration date                         */

	struct vtoc_labeldate DS1CREDT; /* creation date: ydd */

	struct vtoc_labeldate DS1EXPDT; /* expiration date */

	__u8 DS1NOEPV;		/* number of extents on volume */

	__u8 DS1NOBDB;		/* no. of bytes used in last direction blk */

	__u8 DS1FLAG1;		/* flag 1 */

	char DS1SYSCD[13];	/* system code */

	labeldate_t DS1REFD;      /* date last referenced                    */

	struct vtoc_labeldate DS1REFD; /* date last referenced	*/

	__u8 DS1SMSFG;		/* system managed storage indicators */

	__u8 DS1SCXTF;		/* sec. space extension flag byte */

	__u16 DS1SCXTV;		/* secondary space extension value */
@@ -133,240 +105,75 @@ typedef struct format1_label 
	__u8 DS1DSIND;		/* data set indicators */

	__u8 DS1SCAL1;		/* secondary allocation flag byte */

	char DS1SCAL3[3];	/* secondary allocation quantity */

	ttr_t DS1LSTAR;           /* last used track and block on track      */

	struct vtoc_ttr DS1LSTAR; /* last used track and block on track */

	__u16 DS1TRBAL;		/* space remaining on last used track */

	__u16 res1;		/* reserved */

	extent_t DS1EXT1;         /* first extent description                */

	extent_t DS1EXT2;         /* second extent description               */

	extent_t DS1EXT3;         /* third extent description                */

	cchhb_t DS1PTRDS;         /* possible pointer to f2 or f3 DSCB       */

} __attribute__ ((packed)) format1_label_t;



	struct vtoc_extent DS1EXT1; /* first extent description */

	struct vtoc_extent DS1EXT2; /* second extent description */

	struct vtoc_extent DS1EXT3; /* third extent description */

	struct vtoc_cchhb DS1PTRDS; /* possible pointer to f2 or f3 DSCB */

} __attribute__ ((packed));



typedef struct format4_label 

struct vtoc_format4_label

{

	char DS4KEYCD[44];	/* key code for VTOC labels: 44 times 0x04 */

	__u8 DS4IDFMT;		/* format identifier */

	cchhb_t DS4HPCHR;         /* highest address of a format 1 DSCB      */

	struct vtoc_cchhb DS4HPCHR; /* highest address of a format 1 DSCB */

	__u16 DS4DSREC;		/* number of available DSCB's */

        cchh_t DS4HCCHH;          /* CCHH of next available alternate track  */

	struct vtoc_cchh DS4HCCHH; /* CCHH of next available alternate track */

	__u16 DS4NOATK;		/* number of remaining alternate tracks */

	__u8 DS4VTOCI;		/* VTOC indicators */

	__u8 DS4NOEXT;		/* number of extents in VTOC */

	__u8 DS4SMSFG;		/* system managed storage indicators */

	__u8 DS4DEVAC;		/* number of alternate cylinders.

                                     Subtract from first two bytes of 

                                     DS4DEVSZ to get number of usable

				     cylinders. can be zero. valid

				     only if DS4DEVAV on.                    */

        dev_const_t DS4DEVCT;     /* device constants                        */

				 * Subtract from first two bytes of

				 * DS4DEVSZ to get number of usable

				 * cylinders. can be zero. valid

				 * only if DS4DEVAV on. */

	struct vtoc_dev_const DS4DEVCT;	/* device constants */

	char DS4AMTIM[8];	/* VSAM time stamp */

	char DS4AMCAT[3];	/* VSAM catalog indicator */

	char DS4R2TIM[8];	/* VSAM volume/catalog match time stamp */

	char res1[5];		/* reserved */

	char DS4F6PTR[5];	/* pointer to first format 6 DSCB */

        extent_t DS4VTOCE;        /* VTOC extent description                 */

	struct vtoc_extent DS4VTOCE; /* VTOC extent description */

	char res2[10];		/* reserved */

	__u8 DS4EFLVL;		/* extended free-space management level */

        cchhb_t DS4EFPTR;         /* pointer to extended free-space info     */

	struct vtoc_cchhb DS4EFPTR; /* pointer to extended free-space info */

	char res3[9];		/* reserved */

} __attribute__ ((packed)) format4_label_t;



} __attribute__ ((packed));



typedef struct ds5ext 

struct vtoc_ds5ext

{

	__u16 t;	/* RTA of the first track of free extent */

	__u16 fc;	/* number of whole cylinders in free ext. */

	__u8 ft;	/* number of remaining free tracks */

} __attribute__ ((packed)) ds5ext_t;

} __attribute__ ((packed));





typedef struct format5_label 

struct vtoc_format5_label

{

	char DS5KEYID[4];	/* key identifier */

	ds5ext_t DS5AVEXT;        /* first available (free-space) extent.    */

	ds5ext_t DS5EXTAV[7];     /* seven available extents                 */

	struct vtoc_ds5ext DS5AVEXT; /* first available (free-space) extent. */

	struct vtoc_ds5ext DS5EXTAV[7]; /* seven available extents */

	__u8 DS5FMTID;		/* format identifier */

	ds5ext_t DS5MAVET[18];    /* eighteen available extents              */

	cchhb_t DS5PTRDS;         /* pointer to next format5 DSCB            */

} __attribute__ ((packed)) format5_label_t;



	struct vtoc_ds5ext DS5MAVET[18]; /* eighteen available extents */

	struct vtoc_cchhb DS5PTRDS; /* pointer to next format5 DSCB */

} __attribute__ ((packed));



typedef struct ds7ext 

struct vtoc_ds7ext

{

	__u32 a; /* starting RTA value */

	__u32 b; /* ending RTA value + 1 */

} __attribute__ ((packed)) ds7ext_t;

} __attribute__ ((packed));





typedef struct format7_label 

struct vtoc_format7_label

{

	char DS7KEYID[4];	/* key identifier */

	ds7ext_t DS7EXTNT[5];     /* space for 5 extent descriptions         */

	struct vtoc_ds7ext DS7EXTNT[5]; /* space for 5 extent descriptions */

	__u8 DS7FMTID;		/* format identifier */

	ds7ext_t DS7ADEXT[11];    /* space for 11 extent descriptions        */

	struct vtoc_ds7ext DS7ADEXT[11]; /* space for 11 extent descriptions */

	char res1[2];		/* reserved */

	cchhb_t DS7PTRDS;         /* pointer to next FMT7 DSCB               */

} __attribute__ ((packed)) format7_label_t;





char * vtoc_ebcdic_enc (

        unsigned char source[LINE_LENGTH],

        unsigned char target[LINE_LENGTH],

	int l);

char * vtoc_ebcdic_dec (

        unsigned char source[LINE_LENGTH],

	unsigned char target[LINE_LENGTH],

	int l);

void vtoc_set_extent (

        extent_t * ext,

        __u8 typeind,

        __u8 seqno,

        cchh_t * lower,

        cchh_t * upper);

void vtoc_set_cchh (

        cchh_t * addr,

	__u16 cc,

	__u16 hh);

void vtoc_set_cchhb (

        cchhb_t * addr,

        __u16 cc,

        __u16 hh,

        __u8 b);

void vtoc_set_date (

        labeldate_t * d,

        __u8 year,

        __u16 day);



void vtoc_volume_label_init (

	volume_label_t *vlabel);



int vtoc_read_volume_label (

        char * device,

        unsigned long vlabel_start,

        volume_label_t * vlabel);



int vtoc_write_volume_label (

        char *device,

        unsigned long vlabel_start,

        volume_label_t *vlabel);



void vtoc_volume_label_set_volser (

	volume_label_t *vlabel,

	char *volser);



char *vtoc_volume_label_get_volser (

	volume_label_t *vlabel,

	char *volser);



void vtoc_volume_label_set_key (

        volume_label_t *vlabel,

        char *key);     



void vtoc_volume_label_set_label (

	volume_label_t *vlabel,

	char *lbl);



char *vtoc_volume_label_get_label (

	volume_label_t *vlabel,

	char *lbl);



void vtoc_read_label (

        char *device,

        unsigned long position,

        format1_label_t *f1,

        format4_label_t *f4,

        format5_label_t *f5,

        format7_label_t *f7);



void vtoc_write_label (

        char *device,

        unsigned long position,

        format1_label_t *f1,

	format4_label_t *f4,

	format5_label_t *f5,

	format7_label_t *f7);





void vtoc_init_format1_label (

        char *volid,

        unsigned int blksize,

        extent_t *part_extent,

        format1_label_t *f1);





void vtoc_init_format4_label (

        format4_label_t *f4lbl,

	unsigned int usable_partitions,

	unsigned int cylinders,

	unsigned int tracks,

	unsigned int blocks,

	unsigned int blksize,

	__u16 dev_type);



void vtoc_update_format4_label (

	format4_label_t *f4,

	cchhb_t *highest_f1,

	__u16 unused_update);





void vtoc_init_format5_label (

	format5_label_t *f5);



void vtoc_update_format5_label_add (

	format5_label_t *f5,

	int verbose,

	int cyl,

	int trk,

	__u16 a, 

	__u16 b, 

	__u8 c);

 

void vtoc_update_format5_label_del (

	format5_label_t *f5,

	int verbose,

	int cyl,

	int trk,

	__u16 a, 

	__u16 b, 

	__u8 c);





void vtoc_init_format7_label (

	format7_label_t *f7);



void vtoc_update_format7_label_add (

	format7_label_t *f7,

	int verbose,

	__u32 a, 

	__u32 b);



void vtoc_update_format7_label_del (

	format7_label_t *f7, 

	int verbose,

	__u32 a, 

	__u32 b);





void vtoc_set_freespace(

	format4_label_t *f4,

	format5_label_t *f5,

	format7_label_t *f7,

	char ch,

	int verbose,

	__u32 start,

	__u32 stop,

	int cyl,

	int trk);























	struct vtoc_cchhb DS7PTRDS; /* pointer to next FMT7 DSCB */

} __attribute__ ((packed));



#endif /* _ASM_S390_VTOC_H */