Re: zdb -l fix

On Fri, Aug 03, 2007 at 11:37:30PM +0900, Hidetoshi Shimokawa wrote:
> Hi,
> 
> Current "zdb -l dev" causes errors on label 2 and 3.
> The following patch fixes the problem.
> It may be better to be incorporated into 7.0.
> Thanks,

Looks good, can you ask re_at_ for approval?

> Index: src/contrib/opensolaris/cmd/zdb/zdb.c
> ===================================================================
> --- src.orig/contrib/opensolaris/cmd/zdb/zdb.c  2007-08-02
> 01:25:16.000000000 +0900
> +++ src/contrib/opensolaris/cmd/zdb/zdb.c       2007-08-03
> 23:28:06.475733977 +0900
> _at__at_ -1136,7 +1136,11 _at__at_
>                 exit(1);
>         }
> 
> -       psize = statbuf.st_size;
> +       if (S_ISCHR(statbuf.st_mode))
> +               ioctl(fd, DIOCGMEDIASIZE, &psize);
> +       else
> +               psize = statbuf.st_size;
> +
>         psize = P2ALIGN(psize, (uint64_t)sizeof (vdev_label_t));
> 
>         for (l = 0; l < VDEV_LABELS; l++) {

-- 
Pawel Jakub Dawidek                       http://www.wheel.pl
pjd_at_FreeBSD.org                           http://www.FreeBSD.org
FreeBSD committer                         Am I Evil? Yes, I Am!