Diff for /src/sys/dev/raid/amr/amr_disk.c between versions 1.6 and 1.7

version 1.6, 2003/10/13 06:56:13 version 1.7, 2004/02/13 01:33:19
Line 136  static int Line 136  static int
 amrd_open(dev_t dev, int flags, int fmt, d_thread_t *td)  amrd_open(dev_t dev, int flags, int fmt, d_thread_t *td)
 {  {
     struct amrd_softc   *sc = (struct amrd_softc *)dev->si_drv1;      struct amrd_softc   *sc = (struct amrd_softc *)dev->si_drv1;
#if __FreeBSD_version < 500000             /* old buf style */#if defined(__DragonFly__) || __FreeBSD_version < 500000             /* old buf style */
     struct disklabel    *label;      struct disklabel    *label;
 #endif  #endif
   
Line 149  amrd_open(dev_t dev, int flags, int fmt, Line 149  amrd_open(dev_t dev, int flags, int fmt,
     if (sc->amrd_controller->amr_state & AMR_STATE_SHUTDOWN)      if (sc->amrd_controller->amr_state & AMR_STATE_SHUTDOWN)
         return(ENXIO);          return(ENXIO);
   
#if __FreeBSD_version < 500000             /* old buf style */#if defined(__DragonFly__) || __FreeBSD_version < 500000             /* old buf style */
     label = &sc->amrd_disk.d_label;      label = &sc->amrd_disk.d_label;
     bzero(label, sizeof(*label));      bzero(label, sizeof(*label));
     label->d_type       = DTYPE_SCSI;      label->d_type       = DTYPE_SCSI;

Removed from v.1.6  
changed lines
  Added in v.1.7