Keep a function pointer to the per-discipline I/O interrupt handler in the

discipline data structure. To be used with an upcoming diff.

9 files changed, 19 insertions, 9 deletions

diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c
index 0368263001d..a1159077f69 100644
--- a/sys/dev/softraid.c
+++ b/sys/dev/softraid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid.c,v 1.279 2013/01/15 03:47:10 jsing Exp $ */
+/* $OpenBSD: softraid.c,v 1.280 2013/01/15 04:03:01 jsing Exp $ */
 /*
  * Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org>
@@ -3709,6 +3709,7 @@ sr_discipline_init(struct sr_discipline *sd, int level)
 	sd->sd_scsi_start_stop = sr_raid_start_stop;
 	sd->sd_scsi_sync = sr_raid_sync;
 	sd->sd_scsi_rw = NULL;
+	sd->sd_scsi_intr = NULL;
 	sd->sd_set_chunk_state = sr_set_chunk_state;
 	sd->sd_set_vol_state = sr_set_vol_state;
 	sd->sd_start_discipline = NULL;
diff --git a/sys/dev/softraid_aoe.c b/sys/dev/softraid_aoe.c
index 938b791d2cc..fd2f53e2880 100644
--- a/sys/dev/softraid_aoe.c
+++ b/sys/dev/softraid_aoe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_aoe.c,v 1.26 2012/10/08 14:22:41 jsing Exp $ */
+/* $OpenBSD: softraid_aoe.c,v 1.27 2013/01/15 04:03:01 jsing Exp $ */
 /*
  * Copyright (c) 2008 Ted Unangst <tedu@openbsd.org>
  * Copyright (c) 2008 Marco Peereboom <marco@openbsd.org>
@@ -93,6 +93,7 @@ sr_aoe_discipline_init(struct sr_discipline *sd)
 	sd->sd_create = sr_aoe_create;
 	sd->sd_free_resources = sr_aoe_free_resources;
 	sd->sd_scsi_rw = sr_aoe_rw;
+	sd->sd_scsi_intr = NULL;
 }
 
 void
@@ -116,6 +117,7 @@ sr_aoe_server_discipline_init(struct sr_discipline *sd)
 	sd->sd_scsi_start_stop = NULL;
 	sd->sd_scsi_sync = NULL;
 	sd->sd_scsi_rw = NULL;
+	sd->sd_scsi_intr = NULL;
 	sd->sd_set_chunk_state = NULL;
 	sd->sd_set_vol_state = NULL;
 	sd->sd_start_discipline = sr_aoe_server_start;
diff --git a/sys/dev/softraid_concat.c b/sys/dev/softraid_concat.c
index 8061915c82a..279e2073a18 100644
--- a/sys/dev/softraid_concat.c
+++ b/sys/dev/softraid_concat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_concat.c,v 1.3 2012/10/08 14:22:41 jsing Exp $ */
+/* $OpenBSD: softraid_concat.c,v 1.4 2013/01/15 04:03:01 jsing Exp $ */
 /*
  * Copyright (c) 2008 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2011 Joel Sing <jsing@openbsd.org>
@@ -58,6 +58,7 @@ sr_concat_discipline_init(struct sr_discipline *sd)
 	sd->sd_create = sr_concat_create;
 	sd->sd_free_resources = sr_concat_free_resources;
 	sd->sd_scsi_rw = sr_concat_rw;
+	sd->sd_scsi_intr = sr_concat_intr;
 }
 
 int
diff --git a/sys/dev/softraid_crypto.c b/sys/dev/softraid_crypto.c
index 13881a8f04c..dc152f3f1ac 100644
--- a/sys/dev/softraid_crypto.c
+++ b/sys/dev/softraid_crypto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_crypto.c,v 1.82 2012/10/09 11:57:33 jsing Exp $ */
+/* $OpenBSD: softraid_crypto.c,v 1.83 2013/01/15 04:03:01 jsing Exp $ */
 /*
  * Copyright (c) 2007 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2008 Hans-Joerg Hoexer <hshoexer@openbsd.org>
@@ -128,6 +128,7 @@ sr_crypto_discipline_init(struct sr_discipline *sd)
 	sd->sd_ioctl_handler = sr_crypto_ioctl;
 	sd->sd_meta_opt_handler = sr_crypto_meta_opt_handler;
 	sd->sd_scsi_rw = sr_crypto_rw;
+	sd->sd_scsi_intr = sr_crypto_intr;
 }
 
 int
diff --git a/sys/dev/softraid_raid0.c b/sys/dev/softraid_raid0.c
index 61f36c573dc..734dc2e4d68 100644
--- a/sys/dev/softraid_raid0.c
+++ b/sys/dev/softraid_raid0.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_raid0.c,v 1.27 2012/10/08 14:22:41 jsing Exp $ */
+/* $OpenBSD: softraid_raid0.c,v 1.28 2013/01/15 04:03:01 jsing Exp $ */
 /*
  * Copyright (c) 2008 Marco Peereboom <marco@peereboom.us>
  *
@@ -69,6 +69,7 @@ sr_raid0_discipline_init(struct sr_discipline *sd)
 	sd->sd_create = sr_raid0_create;
 	sd->sd_free_resources = sr_raid0_free_resources;
 	sd->sd_scsi_rw = sr_raid0_rw;
+	sd->sd_scsi_intr = sr_raid0_intr;
 }
 
 int
diff --git a/sys/dev/softraid_raid1.c b/sys/dev/softraid_raid1.c
index 73da7b174e7..454f2c3d55a 100644
--- a/sys/dev/softraid_raid1.c
+++ b/sys/dev/softraid_raid1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_raid1.c,v 1.32 2012/10/08 14:22:41 jsing Exp $ */
+/* $OpenBSD: softraid_raid1.c,v 1.33 2013/01/15 04:03:01 jsing Exp $ */
 /*
  * Copyright (c) 2007 Marco Peereboom <marco@peereboom.us>
  *
@@ -73,6 +73,7 @@ sr_raid1_discipline_init(struct sr_discipline *sd)
 	sd->sd_create = sr_raid1_create;
 	sd->sd_free_resources = sr_raid1_free_resources;
 	sd->sd_scsi_rw = sr_raid1_rw;
+	sd->sd_scsi_intr = sr_raid1_intr;
 	sd->sd_set_chunk_state = sr_raid1_set_chunk_state;
 	sd->sd_set_vol_state = sr_raid1_set_vol_state;
 }
diff --git a/sys/dev/softraid_raid6.c b/sys/dev/softraid_raid6.c
index 186ccbd9a12..a22a0cbbf19 100644
--- a/sys/dev/softraid_raid6.c
+++ b/sys/dev/softraid_raid6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_raid6.c,v 1.27 2012/12/31 10:07:51 miod Exp $ */
+/* $OpenBSD: softraid_raid6.c,v 1.28 2013/01/15 04:03:01 jsing Exp $ */
 /*
  * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2009 Jordan Hargrave <jordan@openbsd.org>
@@ -110,6 +110,7 @@ sr_raid6_discipline_init(struct sr_discipline *sd)
 	sd->sd_free_resources = sr_raid6_free_resources;
 	sd->sd_openings = sr_raid6_openings;
 	sd->sd_scsi_rw = sr_raid6_rw;
+	sd->sd_scsi_intr = sr_raid6_intr;
 	sd->sd_set_chunk_state = sr_raid6_set_chunk_state;
 	sd->sd_set_vol_state = sr_raid6_set_vol_state;
 }
diff --git a/sys/dev/softraid_raidp.c b/sys/dev/softraid_raidp.c
index 0738b74e644..7158852c4ff 100644
--- a/sys/dev/softraid_raidp.c
+++ b/sys/dev/softraid_raidp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_raidp.c,v 1.24 2012/10/08 14:22:41 jsing Exp $ */
+/* $OpenBSD: softraid_raidp.c,v 1.25 2013/01/15 04:03:01 jsing Exp $ */
 /*
  * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2009 Jordan Hargrave <jordan@openbsd.org>
@@ -85,6 +85,7 @@ sr_raidp_discipline_init(struct sr_discipline *sd, u_int8_t type)
 	sd->sd_free_resources = sr_raidp_free_resources;
 	sd->sd_openings = sr_raidp_openings;
 	sd->sd_scsi_rw = sr_raidp_rw;
+	sd->sd_scsi_intr = sr_raidp_intr;
 	sd->sd_set_chunk_state = sr_raidp_set_chunk_state;
 	sd->sd_set_vol_state = sr_raidp_set_vol_state;
 }
diff --git a/sys/dev/softraidvar.h b/sys/dev/softraidvar.h
index ed85b3be44e..f146b364df0 100644
--- a/sys/dev/softraidvar.h
+++ b/sys/dev/softraidvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraidvar.h,v 1.120 2013/01/15 03:47:10 jsing Exp $ */
+/* $OpenBSD: softraidvar.h,v 1.121 2013/01/15 04:03:01 jsing Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org>
@@ -596,6 +596,7 @@ struct sr_discipline {
 	/* SCSI emulation */
 	struct scsi_sense_data	sd_scsi_sense;
 	int			(*sd_scsi_rw)(struct sr_workunit *);
+	void			(*sd_scsi_intr)(struct buf *);
 	int			(*sd_scsi_sync)(struct sr_workunit *);
 	int			(*sd_scsi_tur)(struct sr_workunit *);
 	int			(*sd_scsi_start_stop)(struct sr_workunit *);