system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-15 21:05:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

adaasync: Harmonize with daasync

Browse source 
We should call cam_periph_async() always, like SCSI does. This routine
is supposed to be more of a catch-all.

cam_periph_async() only does actions for AC_LOST_DEVICE. It ignores all
other events (today), but this may not always be true. So this is a nop
change.

Drop in a 'break' so we don't fall through unnecessarily.

Sponsored by:		Netflix
Reviewed by:		mav
Differential Revision:	https://reviews.freebsd.org/D35057
This commit is contained in:
Warner Losh 2022-04-26 11:01:06 -06:00
parent fe2c9f83a6
commit ae1955cd67
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sys/cam/ata/ata_da.c
View file

@ -1352,8 +1352,6 @@ adaasync(void *callback_arg, u_int32_t code,
adasetflags(softc, &cgd);
adasetgeom(softc, &cgd);
disk_resize(softc->disk, M_NOWAIT);
cam_periph_async(periph, code, path, arg);
break;
}
case AC_ADVINFO_CHANGED:
@ -1374,7 +1372,6 @@ adaasync(void *callback_arg, u_int32_t code,
case AC_BUS_RESET:
{
softc = (struct ada_softc *)periph->softc;
cam_periph_async(periph, code, path, arg);
if (softc->state != ADA_STATE_NORMAL)
break;
if (ADA_RA >= 0 && softc->flags & ADA_FLAG_CAN_RAHEAD)
@ -1385,16 +1382,17 @@ adaasync(void *callback_arg, u_int32_t code,
&& (softc->zone_mode != ADA_ZONE_NONE))
softc->state = ADA_STATE_LOGDIR;
else
break;
break;
if (cam_periph_acquire(periph) != 0)
softc->state = ADA_STATE_NORMAL;
else
xpt_schedule(periph, CAM_PRIORITY_DEV);
}
default:
cam_periph_async(periph, code, path, arg);
break;
}
default:
break;
}
cam_periph_async(periph, code, path, arg);
}
static int