NLM/lockd: convert __nlm_async_call to use rpc_run_task()

[safe/jmp/linux-2.6] / drivers / md / dm-hw-handler.h

diff --git a/drivers/md/dm-hw-handler.h b/drivers/md/dm-hw-handler.h
index 15f5629..46809dc 100644 (file)
--- a/drivers/md/dm-hw-handler.h
+++ b/drivers/md/dm-hw-handler.h
@@ -16,6 +16,7 @@
 struct hw_handler_type;
 struct hw_handler {
        struct hw_handler_type *type;
+       struct mapped_device *md;
        void *context;
 };
 
@@ -32,7 +33,7 @@ struct hw_handler_type {
        void (*destroy) (struct hw_handler *hwh);
 
        void (*pg_init) (struct hw_handler *hwh, unsigned bypassed,
-                        struct path *path);
+                        struct dm_path *path);
        unsigned (*error) (struct hw_handler *hwh, struct bio *bio);
        int (*status) (struct hw_handler *hwh, status_type_t type,
                       char *result, unsigned int maxlen);
@@ -57,5 +58,6 @@ unsigned dm_scsi_err_handler(struct hw_handler *hwh, struct bio *bio);
 #define MP_FAIL_PATH 1
 #define MP_BYPASS_PG 2
 #define MP_ERROR_IO  4 /* Don't retry this I/O */
+#define MP_RETRY 8
 
 #endif