ide-cd: fix endianity for the error message in cdrom_read_capacity (938bb03d) · Commits · 戴 / test

Aesthetic regards aside, commit still leaves a bug in the error message, because it uses the unconverted big-endian value for printk. Fix this by using a local variable in machine byte order. The result is correct, more readable, and also produces slightly shorter code on i386. Signed-off-by:

Petr Tesarik <ptesarik@suse.cz> Cc: Jens Axboe <jens.axboe@oracle.com> Cc: Jan Kara <jack@suse.cz> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: <stable@kernel.org> Acked-by:

Borislav Petkov <petkovbb@gmail.com> [bart: __u32 -> u32] Signed-off-by:

Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

drivers/ide/ide-cd.c

+10 −8

Original line number	Diff line number	Diff line
		@@ -1307,6 +1307,7 @@ static int cdrom_read_capacity(ide_drive_t drive, unsigned long capacity,
		int stat;
		unsigned char cmd[BLK_MAX_CDB];
		unsigned len = sizeof(capbuf);
		u32 blocklen;

		memset(cmd, 0, BLK_MAX_CDB);
		cmd[0] = GPCMD_READ_CDVD_CAPACITY;
		@@ -1319,23 +1320,24 @@ static int cdrom_read_capacity(ide_drive_t drive, unsigned long capacity,
		/*
		* Sanity check the given block size
		*/
		switch (capbuf.blocklen) {
		case __constant_cpu_to_be32(512):
		case __constant_cpu_to_be32(1024):
		case __constant_cpu_to_be32(2048):
		case __constant_cpu_to_be32(4096):
		blocklen = be32_to_cpu(capbuf.blocklen);
		switch (blocklen) {
		case 512:
		case 1024:
		case 2048:
		case 4096:
		break;
		default:
		printk(KERN_ERR "%s: weird block size %u\n",
		drive->name, capbuf.blocklen);
		drive->name, blocklen);
		printk(KERN_ERR "%s: default to 2kb block size\n",
		drive->name);
		capbuf.blocklen = __constant_cpu_to_be32(2048);
		blocklen = 2048;
		break;
		}

		*capacity = 1 + be32_to_cpu(capbuf.lba);
		*sectors_per_frame = be32_to_cpu(capbuf.blocklen) >> SECTOR_BITS;
		*sectors_per_frame = blocklen >> SECTOR_BITS;
		return 0;
		}

Admin message