Commit 2decd5a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] cio: fix potential overflow in chpid descriptor
  [S390] add missing device put
  [S390] dasd: use correct label location for diag fba disks
parents b4fd4f89 878c4956

drivers/s390/block/dasd_devmap.c

+3 −1
Original line number Diff line number Diff line
@@ -948,9 +948,11 @@ static ssize_t dasd_alias_show(struct device *dev, 
	if (device->discipline && device->discipline->get_uid &&

	    !device->discipline->get_uid(device, &uid)) {

		if (uid.type == UA_BASE_PAV_ALIAS ||

		    uid.type == UA_HYPER_PAV_ALIAS)

		    uid.type == UA_HYPER_PAV_ALIAS) {

			dasd_put_device(device);

			return sprintf(buf, "1\n");

		}

	}

	dasd_put_device(device);



	return sprintf(buf, "0\n");

drivers/s390/cio/chsc.c

+1 −1
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ int chsc_determine_base_channel_path_desc(struct chp_id chpid, 
	ret = chsc_determine_channel_path_desc(chpid, 0, 0, 0, 0, chsc_resp);

	if (ret)

		goto out_free;

	memcpy(desc, &chsc_resp->data, chsc_resp->length);

	memcpy(desc, &chsc_resp->data, sizeof(*desc));

out_free:

	kfree(chsc_resp);

	return ret;

fs/partitions/ibm.c

+12 −2
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ int ibm_partition(struct parsed_partitions *state) 
	} *label;

	unsigned char *data;

	Sector sect;

	sector_t labelsect;



	res = 0;

	blocksize = bdev_logical_block_size(bdev);
@@ -97,11 +98,20 @@ int ibm_partition(struct parsed_partitions *state) 
	    ioctl_by_bdev(bdev, HDIO_GETGEO, (unsigned long)geo) != 0)

		goto out_freeall;



	/*

	 * Special case for FBA disks: label sector does not depend on

	 * blocksize.

	 */

	if ((info->cu_type == 0x6310 && info->dev_type == 0x9336) ||

	    (info->cu_type == 0x3880 && info->dev_type == 0x3370))

		labelsect = info->label_block;

	else

		labelsect = info->label_block * (blocksize >> 9);



	/*

	 * Get volume label, extract name and type.

	 */

	data = read_part_sector(state, info->label_block*(blocksize/512),

				&sect);

	data = read_part_sector(state, labelsect, &sect);

	if (data == NULL)

		goto out_readerr;