Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux.git] / include / scsi / scsi_dh.h

diff --git a/include/scsi/scsi_dh.h b/include/scsi/scsi_dh.h
index e3f2db212ddc8a9029ba8b2b243d2e251864e4dd..620c723ee8ed8a741f976599f9b0d4cbc8d2914d 100644 (file)
--- a/include/scsi/scsi_dh.h
+++ b/include/scsi/scsi_dh.h
@@ -60,6 +60,7 @@ extern int scsi_dh_activate(struct request_queue *, activate_complete, void *);
 extern int scsi_dh_handler_exist(const char *);
 extern int scsi_dh_attach(struct request_queue *, const char *);
 extern void scsi_dh_detach(struct request_queue *);
+extern const char *scsi_dh_attached_handler_name(struct request_queue *, gfp_t);
 extern int scsi_dh_set_params(struct request_queue *, const char *);
 #else
 static inline int scsi_dh_activate(struct request_queue *req,
@@ -80,6 +81,11 @@ static inline void scsi_dh_detach(struct request_queue *q)
 {
        return;
 }
+static inline const char *scsi_dh_attached_handler_name(struct request_queue *q,
+                                                       gfp_t gfp)
+{
+       return NULL;
+}
 static inline int scsi_dh_set_params(struct request_queue *req, const char *params)
 {
        return -SCSI_DH_NOSYS;