partitions/ibm.c
Andries,
okay, your arguments appear correct to me. Additionally there has some other work
to be done... I include the patch to be applied from my point of view:
(See attached file: ibmpart.diff)
It includes the adaptions to the dasd_*.c files in drivers/s390/block and also should
fix the fill_geometry functions to make HDIO_GETGEO work like others.
Gruesse / Regards
Dr. Holger Smolinski
Linux for S/390 Design & Development,
IBM Deutschland Entwicklung GmbH, Schoenaicher Str. 220, D-71032 Boeblingen Phone/FAX: +49 7031 16 (x902) - 4652/3456
Index: drivers/s390/block/dasd.c
===================================================================
RCS file: /home/cvs/linux-2.3/drivers/s390/block/dasd.c,v retrieving revision 1.92
s390/block/dasd.c +4 -2
@@ -1979,10 +1979,11 @@break ; }case HDIO_GETGEO :{ -struct hd_geometry geo = - {0 ,}; +struct hd_geometry geo = {0 ,};if (device->discipline->fill_geometry) device->discipline->fill_geometry (device, &geo); + geo.start = device->major_info-> + gendisk.part[MINOR (inp->i_rdev)].start_sect; rc =copy_to_user ((struct hd_geometry *) data, &geo,sizeof (struct hd_geometry ));if (rc)
@@ -2543,6 +2544,7 @@ dd = &major_info->gendisk; dd->sizes[minor] = (device->sizes.blocks << device->sizes.s2b_shift) >>1 ; + dd->part[minor].start_sect = device->sizes.pt_block; {char buffer[5 ];sprintf (buffer,"%04X" ,device->devinfo.devno);
Index: drivers/s390/block/dasd_diag.c
===================================================================
RCS file: /home/cvs/linux-2.3/drivers/s390/block/dasd_diag.c,v retrieving revision 1.9
s390/block/dasd_diag.c +9 -10
@@ -355,19 +360,26 @@static int dasd_diag_do_analysis (struct dasd_device_t *device) { -int sb;dasd_diag_private_t *private = (dasd_diag_private_t *) device->private;long *label = private->label;/* real size of the volume */ device->sizes.blocks = label[7 ]; +if (private->rdc_data.vdev_class ==DEV_CLASS_FBA ) { + device->sizes.pt_block =1 ; + }else if (private->rdc_data.vdev_class ==DEV_CLASS_ECKD || + private->rdc_data.vdev_class ==DEV_CLASS_CKD ) { + device->sizes.pt_block =2 ; + }else { +return -EINVAL ; + } printk (KERN_INFO PRINTK_HEADER"/dev/%s (%04X): capacity (%dkB blks): %ldkB\n" , device->name, device->devinfo.devno, (device->sizes.bp_block >>10 ), (device->sizes.blocks << device->sizes.s2b_shift) >> 1); -free_page (private->label); +free_page ((long )private->label);return 0 ; }
@@ -394,14 +406,6 @@ geo->cylinders = cyls; geo->heads =16 ; geo->sectors =128 >> device->sizes.s2b_shift; -if (private->rdc_data.vdev_class ==DEV_CLASS_FBA ) { - geo->start =1 ; - }else if (private->rdc_data.vdev_class ==DEV_CLASS_ECKD || - private->rdc_data.vdev_class ==DEV_CLASS_CKD ) { - geo->start =2 ; - }else { -return -EINVAL ; - }return rc; }
Index: drivers/s390/block/dasd_eckd.c
===================================================================
RCS file: /home/cvs/linux-2.3/drivers/s390/block/dasd_eckd.c,v retrieving revision 1.42
s390/block/dasd_eckd.c +1 -1
@@ -517,6 +517,7 @@return -EMEDIUMTYPE ; } device->sizes.s2b_shift =0 ;/* bits to shift 512 to get a block */ + device->sizes.pt_block =2 ;for (sb =512 ; sb < bs; sb = sb <<1 ) device->sizes.s2b_shift++;
@@ -554,7 +555,6 @@ geo->cylinders = private->rdc_data.no_cyl; geo->heads = private->rdc_data.trk_per_cyl; geo->sectors =recs_per_track (&(private->rdc_data),0 , device->sizes.bp_block); - geo->start =2 ;return rc; }
Index: drivers/s390/block/dasd_fba.c
===================================================================
RCS file: /home/cvs/linux-2.3/drivers/s390/block/dasd_fba.c,v retrieving revision 1.26
s390/block/dasd_fba.c +1 -1
@@ -180,6 +180,7 @@ device->sizes.s2b_shift++; device->sizes.blocks = (private->rdc_data.blk_bdsa); + device->sizes.pt_block =1 ;return rc; }
@@ -204,7 +205,6 @@ geo->cylinders = cyls; geo->heads =16 ; geo->sectors =128 >> device->sizes.s2b_shift; - geo->start =1 ;return rc; }
Index: fs/partitions/ibm.c
===================================================================
RCS file: /home/cvs/linux-2.3/fs/partitions/ibm.c,v retrieving revision 1.13
partitions/ibm.c +28 -75
148 lines not on this page · raw message
Index: include/asm-s390/dasd.h
===================================================================
RCS file: /home/cvs/linux-2.3/include/asm-s390/dasd.h,v retrieving revision 1.16
asm-s390/dasd.h +1 -0
@@ -195,6 +195,7 @@unsigned long blocks;/* size of volume in blocks */ unsigned int bp_block;/* bytes per block */ unsigned int s2b_shift;/* log2 (bp_block/512) */ +unsigned int pt_block;/* from which block to read the partn table */ } dasd_sizes_t;/*