dm mpath: reduce size of struct multipath

[profile/ivi/kernel-x86-ivi.git] / drivers / md / dm-mpath.c

diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index 922a338..c351607 100644 (file)
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -61,11 +61,11 @@ struct multipath {
        struct list_head list;
        struct dm_target *ti;
 
-       spinlock_t lock;
-
        const char *hw_handler_name;
        char *hw_handler_params;
 
+       spinlock_t lock;
+
        unsigned nr_priority_groups;
        struct list_head priority_groups;
 
@@ -81,16 +81,17 @@ struct multipath {
        struct priority_group *next_pg; /* Switch to this PG if set */
        unsigned repeat_count;          /* I/Os left before calling PS again */
 
-       unsigned queue_io;              /* Must we queue all I/O? */
-       unsigned queue_if_no_path;      /* Queue I/O if last path fails? */
-       unsigned saved_queue_if_no_path;/* Saved state during suspension */
+       unsigned queue_io:1;            /* Must we queue all I/O? */
+       unsigned queue_if_no_path:1;    /* Queue I/O if last path fails? */
+       unsigned saved_queue_if_no_path:1; /* Saved state during suspension */
+
        unsigned pg_init_retries;       /* Number of times to retry pg_init */
        unsigned pg_init_count;         /* Number of times pg_init called */
        unsigned pg_init_delay_msecs;   /* Number of msecs before pg_init retry */
 
+       unsigned queue_size;
        struct work_struct process_queued_ios;
        struct list_head queued_ios;
-       unsigned queue_size;
 
        struct work_struct trigger_event;
 
@@ -718,8 +719,8 @@ static int parse_hw_handler(struct dm_arg_set *as, struct multipath *m)
                return 0;
 
        m->hw_handler_name = kstrdup(dm_shift_arg(as), GFP_KERNEL);
-       request_module("scsi_dh_%s", m->hw_handler_name);
-       if (scsi_dh_handler_exist(m->hw_handler_name) == 0) {
+       if (!try_then_request_module(scsi_dh_handler_exist(m->hw_handler_name),
+                                    "scsi_dh_%s", m->hw_handler_name)) {
                ti->error = "unknown hardware handler type";
                ret = -EINVAL;
                goto fail;