diff options
| author | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
|---|---|---|
| committer | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
| commit | bf8e8a6e8f0bd9165109f0a258730dd242299815 (patch) | |
| tree | f16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/dev/raidframe | |
| parent | 2180deee00350fff613a1d1d1328eddc4c0ba9c8 (diff) | |
| download | FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.zip FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.tar.gz | |
Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.
Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
Diffstat (limited to 'sys/dev/raidframe')
| -rw-r--r-- | sys/dev/raidframe/rf_freebsdkintf.c | 14 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_shutdown.c | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/raidframe/rf_freebsdkintf.c b/sys/dev/raidframe/rf_freebsdkintf.c index e2b2508..144cda6 100644 --- a/sys/dev/raidframe/rf_freebsdkintf.c +++ b/sys/dev/raidframe/rf_freebsdkintf.c @@ -917,7 +917,7 @@ raidioctl(dev, cmd, data, flag, td) case RAIDFRAME_INIT_LABELS: MALLOC(ci_label, RF_ComponentLabel_t *, sizeof(RF_ComponentLabel_t), M_RAIDFRAME, - M_WAITOK | M_ZERO); + M_ZERO); clabel = (RF_ComponentLabel_t *) data; /* we only want the serial number from @@ -984,7 +984,7 @@ raidioctl(dev, cmd, data, flag, td) case RAIDFRAME_ADD_HOT_SPARE: MALLOC(hot_spare, RF_SingleComponent_t *, sizeof(RF_SingleComponent_t), M_RAIDFRAME, - M_WAITOK | M_ZERO); + M_ZERO); sparePtr = (RF_SingleComponent_t *) data; memcpy( hot_spare, sparePtr, sizeof(RF_SingleComponent_t)); retcode = rf_add_hot_spare(raidPtr, hot_spare); @@ -997,7 +997,7 @@ raidioctl(dev, cmd, data, flag, td) case RAIDFRAME_DELETE_COMPONENT: MALLOC(component, RF_SingleComponent_t *, sizeof(RF_SingleComponent_t), M_RAIDFRAME, - M_WAITOK | M_ZERO); + M_ZERO); componentPtr = (RF_SingleComponent_t *)data; memcpy( component, componentPtr, sizeof(RF_SingleComponent_t)); @@ -1008,7 +1008,7 @@ raidioctl(dev, cmd, data, flag, td) case RAIDFRAME_INCORPORATE_HOT_SPARE: MALLOC(component, RF_SingleComponent_t *, sizeof(RF_SingleComponent_t), M_RAIDFRAME, - M_WAITOK | M_ZERO); + M_ZERO); componentPtr = (RF_SingleComponent_t *)data; memcpy( component, componentPtr, sizeof(RF_SingleComponent_t)); @@ -1020,7 +1020,7 @@ raidioctl(dev, cmd, data, flag, td) MALLOC(component, RF_SingleComponent_t *, sizeof(RF_SingleComponent_t), M_RAIDFRAME, - M_WAITOK | M_ZERO); + M_ZERO); if (raidPtr->Layout.map->faultsTolerated == 0) { /* Can't do this on a RAID 0!! */ FREE(component, M_RAIDFRAME); @@ -2894,7 +2894,7 @@ rf_set_autoconfig(raidPtr, new_value) int row, column; MALLOC(clabel, RF_ComponentLabel_t *, sizeof(RF_ComponentLabel_t), - M_RAIDFRAME, M_WAITOK | M_ZERO); + M_RAIDFRAME, M_ZERO); raidPtr->autoconfigure = new_value; for(row=0; row<raidPtr->numRow; row++) { @@ -2924,7 +2924,7 @@ rf_set_rootpartition(raidPtr, new_value) int row, column; MALLOC(clabel, RF_ComponentLabel_t *, sizeof(RF_ComponentLabel_t), - M_RAIDFRAME, M_WAITOK | M_ZERO); + M_RAIDFRAME, M_ZERO); raidPtr->root_partition = new_value; for(row=0; row<raidPtr->numRow; row++) { diff --git a/sys/dev/raidframe/rf_shutdown.c b/sys/dev/raidframe/rf_shutdown.c index 7db93e9..9dc6255 100644 --- a/sys/dev/raidframe/rf_shutdown.c +++ b/sys/dev/raidframe/rf_shutdown.c @@ -61,7 +61,7 @@ _rf_ShutdownCreate( * and shutdown after RAIDframe internal allocation system. */ /* ent = (RF_ShutdownList_t *) malloc(sizeof(RF_ShutdownList_t), - M_RAIDFRAME, M_WAITOK); */ + M_RAIDFRAME, 0); */ ent = (RF_ShutdownList_t *) malloc(sizeof(RF_ShutdownList_t), M_RAIDFRAME, M_NOWAIT); if (ent == NULL) |
