Commit 85b0c6e6 authored by Dwight Engen's avatar Dwight Engen Committed by David S. Miller

sunvdc: don't call VD_OP_GET_VTOC

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: default avatarDwight Engen <dwight.engen@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c20ce793
...@@ -69,8 +69,6 @@ struct vdc_port { ...@@ -69,8 +69,6 @@ struct vdc_port {
u8 vdisk_mtype; u8 vdisk_mtype;
char disk_name[32]; char disk_name[32];
struct vio_disk_vtoc label;
}; };
static inline struct vdc_port *to_vdc_port(struct vio_driver_state *vio) static inline struct vdc_port *to_vdc_port(struct vio_driver_state *vio)
...@@ -710,13 +708,6 @@ static int probe_disk(struct vdc_port *port) ...@@ -710,13 +708,6 @@ static int probe_disk(struct vdc_port *port)
if (comp.err) if (comp.err)
return 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)) { if (vdc_version_supported(port, 1, 1)) {
/* vdisk_size should be set during the handshake, if it wasn't /* vdisk_size should be set during the handshake, if it wasn't
* then the underlying disk is reserved by another system * then the underlying disk is reserved by another system
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment