Page MenuHomeFreeBSD
Files F145987734

D33925.id.diff
No OneTemporary
Actions

D33925.id.diff
View Options

diff --git a/sys/dev/mpr/mpr_sas.h b/sys/dev/mpr/mpr_sas.h
--- a/sys/dev/mpr/mpr_sas.h
+++ b/sys/dev/mpr/mpr_sas.h
@@ -91,9 +91,7 @@
u_int flags;
#define MPRSAS_IN_DISCOVERY (1 << 0)
#define MPRSAS_IN_STARTUP (1 << 1)
-#define MPRSAS_DISCOVERY_TIMEOUT_PENDING (1 << 2)
#define MPRSAS_QUEUE_FROZEN (1 << 3)
-#define MPRSAS_SHUTDOWN (1 << 4)
#define MPRSAS_TOREMOVE (1 << 5)
u_int maxtargets;
struct mprsas_target *targets;
@@ -101,7 +99,6 @@
struct cam_sim *sim;
struct cam_path *path;
struct intr_config_hook sas_ich;
- struct callout discovery_callout;
struct mpr_event_handle *mprsas_eh;
u_int startup_refcount;
diff --git a/sys/dev/mpr/mpr_sas.c b/sys/dev/mpr/mpr_sas.c
--- a/sys/dev/mpr/mpr_sas.c
+++ b/sys/dev/mpr/mpr_sas.c
@@ -820,8 +820,6 @@
sc->sassc->startup_refcount = 0;
mprsas_startup_increment(sassc);
- callout_init(&sassc->discovery_callout, 1 /*mpsafe*/);
-
mpr_unlock(sc);
/*
@@ -937,9 +935,6 @@
MPR_FUNCTRACE(sc);
- if (sassc->flags & MPRSAS_DISCOVERY_TIMEOUT_PENDING)
- callout_stop(&sassc->discovery_callout);
-
/*
* After discovery has completed, check the mapping table for any
* missing devices and update their missing counts. Only do this once
diff --git a/sys/dev/mps/mps_sas.h b/sys/dev/mps/mps_sas.h
--- a/sys/dev/mps/mps_sas.h
+++ b/sys/dev/mps/mps_sas.h
@@ -86,16 +86,13 @@
u_int flags;
#define MPSSAS_IN_DISCOVERY (1 << 0)
#define MPSSAS_IN_STARTUP (1 << 1)
-#define MPSSAS_DISCOVERY_TIMEOUT_PENDING (1 << 2)
#define MPSSAS_QUEUE_FROZEN (1 << 3)
-#define MPSSAS_SHUTDOWN (1 << 4)
u_int maxtargets;
struct mpssas_target *targets;
struct cam_devq *devq;
struct cam_sim *sim;
struct cam_path *path;
struct intr_config_hook sas_ich;
- struct callout discovery_callout;
struct mps_event_handle *mpssas_eh;
u_int startup_refcount;
diff --git a/sys/dev/mps/mps_sas.c b/sys/dev/mps/mps_sas.c
--- a/sys/dev/mps/mps_sas.c
+++ b/sys/dev/mps/mps_sas.c
@@ -86,9 +86,6 @@
#include <dev/mps/mps_table.h>
#include <dev/mps/mps_sas.h>
-#define MPSSAS_DISCOVERY_TIMEOUT 20
-#define MPSSAS_MAX_DISCOVERY_TIMEOUTS 10 /* 200 seconds */
-
/*
* static array to check SCSI OpCode for EEDP protection bits
*/
@@ -773,8 +770,6 @@
sc->sassc->startup_refcount = 0;
mpssas_startup_increment(sassc);
- callout_init(&sassc->discovery_callout, 1 /*mpsafe*/);
-
mps_unlock(sc);
/*
@@ -889,9 +884,6 @@
MPS_FUNCTRACE(sc);
- if (sassc->flags & MPSSAS_DISCOVERY_TIMEOUT_PENDING)
- callout_stop(&sassc->discovery_callout);
-
/*
* After discovery has completed, check the mapping table for any
* missing devices and update their missing counts. Only do this once

File Metadata

Mime Type
text/plain
Expires
Fri, Feb 27, 7:03 PM (21 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29021094
Default Alt Text
D33925.id.diff (2 KB)

Event Timeline