[BACK]Return to rf_netbsdkintf.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sys / dev / raidframe

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sys/dev/raidframe/rf_netbsdkintf.c between version 1.336 and 1.337

version 1.336, 2016/01/04 11:12:40 version 1.337, 2016/01/04 13:15:17
Line 967  raid_detach_unlocked(struct raid_softc *
Line 967  raid_detach_unlocked(struct raid_softc *
   
         raidPtr = &rs->sc_r;          raidPtr = &rs->sc_r;
   
         if (DK_BUSY(dksc, 0))          if (DK_BUSY(dksc, 0) ||
               raidPtr->recon_in_progress != 0 ||
               raidPtr->parity_rewrite_in_progress != 0 ||
               raidPtr->copyback_in_progress != 0)
                 return EBUSY;                  return EBUSY;
   
         if ((rs->sc_flags & RAIDF_INITED) == 0)          if ((rs->sc_flags & RAIDF_INITED) == 0)
Line 1180  raidioctl(dev_t dev, u_long cmd, void *d
Line 1183  raidioctl(dev_t dev, u_long cmd, void *d
                 if ((error = raidlock(rs)) != 0)                  if ((error = raidlock(rs)) != 0)
                         return (error);                          return (error);
   
                 if (DK_BUSY(dksc, pmask))                  if (DK_BUSY(dksc, pmask) ||
                       raidPtr->recon_in_progress != 0 ||
                       raidPtr->parity_rewrite_in_progress != 0 ||
                       raidPtr->copyback_in_progress != 0)
                         retcode = EBUSY;                          retcode = EBUSY;
                 else {                  else {
                         /* detach and free on close */                          /* detach and free on close */
Legend:
Removed from v.1.336  
changed lines
  Added in v.1.337
CVSweb <webmaster@jp.NetBSD.org>