Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba482ef4 authored by James Bottomley's avatar James Bottomley
Browse files

Merge by hand (conflicts in sr.c)

parents e514385b 51490c89

drivers/scsi/sr.c

+2 −22
Original line number Diff line number Diff line
@@ -199,15 +199,7 @@ int sr_media_change(struct cdrom_device_info *cdi, int slot) 
		/* check multisession offset etc */

		sr_cd_check(cdi);



		/* 

		 * If the disk changed, the capacity will now be different,

		 * so we force a re-read of this information 

		 * Force 2048 for the sector size so that filesystems won't

		 * be trying to use something that is too small if the disc

		 * has changed.

		 */

		cd->needs_sector_size = 1;

		cd->device->sector_size = 2048;

		get_sectorsize(cd);

	}

	return retval;

}
@@ -538,13 +530,6 @@ static int sr_open(struct cdrom_device_info *cdi, int purpose) 
	if (!scsi_block_when_processing_errors(sdev))

		goto error_out;



	/*

	 * If this device did not have media in the drive at boot time, then

	 * we would have been unable to get the sector size.  Check to see if

	 * this is the case, and try again.

	 */

	if (cd->needs_sector_size)

		get_sectorsize(cd);

	return 0;



error_out:
@@ -604,7 +589,6 @@ static int sr_probe(struct device *dev) 
	cd->driver = &sr_template;

	cd->disk = disk;

	cd->capacity = 0x1fffff;

	cd->needs_sector_size = 1;

	cd->device->changed = 1;	/* force recheck CD type */

	cd->use = 1;

	cd->readcd_known = 0;
@@ -682,7 +666,6 @@ static void get_sectorsize(struct scsi_cd *cd) 
	if (the_result) {

		cd->capacity = 0x1fffff;

		sector_size = 2048;	/* A guess, just in case */

		cd->needs_sector_size = 1;

	} else {

#if 0

		if (cdrom_get_last_written(&cd->cdi,
@@ -715,7 +698,6 @@ static void get_sectorsize(struct scsi_cd *cd) 
			printk("%s: unsupported sector size %d.\n",

			       cd->cdi.name, sector_size);

			cd->capacity = 0;

			cd->needs_sector_size = 1;

		}



		cd->device->sector_size = sector_size;
@@ -724,7 +706,6 @@ static void get_sectorsize(struct scsi_cd *cd) 
		 * Add this so that we have the ability to correctly gauge

		 * what the device is capable of.

		 */

		cd->needs_sector_size = 0;

		set_capacity(cd->disk, cd->capacity);

	}
@@ -736,8 +717,7 @@ out: 


Enomem:

	cd->capacity = 0x1fffff;

	sector_size = 2048;	/* A guess, just in case */

	cd->needs_sector_size = 1;

	cd->device->sector_size = 2048;	/* A guess, just in case */

	goto out;

}

drivers/scsi/sr.h

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ typedef struct scsi_cd { 
	struct scsi_device *device;

	unsigned int vendor;	/* vendor code, see sr_vendor.c         */

	unsigned long ms_offset;	/* for reading multisession-CD's        */

	unsigned needs_sector_size:1;	/* needs to get sector size */

	unsigned use:1;		/* is this device still supportable     */

	unsigned xa_flag:1;	/* CD has XA sectors ? */

	unsigned readcd_known:1;	/* drive supports READ_CD (0xbe) */