# HG changeset patch # User Dan McDonald # Date 1373468294 14400 # Node ID fa08ad0765cf0ff8d2046d358a7231e209450055 # Parent f73fc37ec88d9df501ec11469a35534405f7abba 3878 blkdev needs to support DKIOCGMEDIAINFOEXT Reviewed by: Saso Kiselkov Reviewed by: Garrett D'Amore Approved by: Garrett D'Amore diff -r f73fc37ec88d -r fa08ad0765cf usr/src/uts/common/io/blkdev/blkdev.c --- a/usr/src/uts/common/io/blkdev/blkdev.c Mon Jul 08 08:57:02 2013 -0800 +++ b/usr/src/uts/common/io/blkdev/blkdev.c Wed Jul 10 10:58:14 2013 -0400 @@ -20,9 +20,9 @@ */ /* * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2012 Nexenta Systems, Inc. All rights reserved. * Copyright 2012 Garrett D'Amore . All rights reserved. * Copyright 2012 Alexey Zaytsev All rights reserved. + * Copyright 2013 Nexenta Systems, Inc. All rights reserved. */ #include @@ -1051,7 +1051,22 @@ minfo.dki_media_type = DK_FIXED_DISK; minfo.dki_lbsize = (1U << bd->d_blkshift); minfo.dki_capacity = bd->d_numblks; - if (ddi_copyout(&minfo, ptr, sizeof (minfo), flag)) { + if (ddi_copyout(&minfo, ptr, sizeof (minfo), flag)) { + return (EFAULT); + } + return (0); + } + case DKIOCGMEDIAINFOEXT: { + struct dk_minfo_ext miext; + + /* make sure our state information is current */ + bd_update_state(bd); + bzero(&miext, sizeof (miext)); + miext.dki_media_type = DK_FIXED_DISK; + miext.dki_lbsize = (1U << bd->d_blkshift); + miext.dki_pbsize = miext.dki_lbsize; + miext.dki_capacity = bd->d_numblks; + if (ddi_copyout(&miext, ptr, sizeof (miext), flag)) { return (EFAULT); } return (0); @@ -1074,7 +1089,7 @@ cinfo.dki_space = 0; cinfo.dki_prio = 0; cinfo.dki_vec = 0; - if (ddi_copyout(&cinfo, ptr, sizeof (cinfo), flag)) { + if (ddi_copyout(&cinfo, ptr, sizeof (cinfo), flag)) { return (EFAULT); } return (0);