This is a note to let you know that I've just added the patch titled
sunvdc: don't call VD_OP_GET_VTOC
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
sunvdc-don-t-call-vd_op_get_vtoc.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Tue Nov 18 09:08:47 PST 2014
From: Dwight Engen <dwight.engen@xxxxxxxxxx>
Date: Thu, 30 Oct 2014 15:55:35 -0400
Subject: sunvdc: don't call VD_OP_GET_VTOC
From: Dwight Engen <dwight.engen@xxxxxxxxxx>
[ Upstream commit 85b0c6e62c48bb9179fd5b3e954f362fb346cbd5 ]
The VD_OP_GET_VTOC operation will succeed only if the vdisk backend has a
VTOC label, otherwise it will fail. In particular, it will return error
48 (ENOTSUP) if the disk has an EFI label. VTOC disk labels are already
handled by directly reading the disk in block/partitions/sun.c (enabled by
CONFIG_SUN_PARTITION which defaults to y on SPARC). Since port->label is
unused in the driver, remove the call and the field.
Signed-off-by: Dwight Engen <dwight.engen@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/block/sunvdc.c | 9 ---------
1 file changed, 9 deletions(-)
--- a/drivers/block/sunvdc.c
+++ b/drivers/block/sunvdc.c
@@ -69,8 +69,6 @@ struct vdc_port {
u8 vdisk_mtype;
char disk_name[32];
-
- struct vio_disk_vtoc label;
};
static inline struct vdc_port *to_vdc_port(struct vio_driver_state *vio)
@@ -710,13 +708,6 @@ static int probe_disk(struct vdc_port *p
if (comp.err)
return comp.err;
- err = generic_request(port, VD_OP_GET_VTOC,
- &port->label, sizeof(port->label));
- if (err < 0) {
- printk(KERN_ERR PFX "VD_OP_GET_VTOC returns error %d\n", err);
- return err;
- }
-
if (vdc_version_supported(port, 1, 1)) {
/* vdisk_size should be set during the handshake, if it wasn't
* then the underlying disk is reserved by another system
Patches currently in stable-queue which might be from dwight.engen@xxxxxxxxxx are
queue-3.10/vio-fix-reuse-of-vio_dring-slot.patch
queue-3.10/sunvdc-compute-vdisk-geometry-from-capacity.patch
queue-3.10/sunvdc-add-cdrom-and-v1.1-protocol-support.patch
queue-3.10/sunvdc-don-t-call-vd_op_get_vtoc.patch
queue-3.10/sunvdc-limit-each-sg-segment-to-a-page.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html