5 files changed, 19 insertions, 21 deletions

diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index ca203cb23f3c..5c9362792f1d 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -854,7 +854,7 @@ static void bitmap_file_set_bit(struct bitmap *bitmap, sector_t block)
                 if (bitmap->flags & BITMAP_HOSTENDIAN)
                         set_bit(bit, kaddr);
                 else
-                        ext2_set_bit(bit, kaddr);
+                        __test_and_set_bit_le(bit, kaddr);
                 kunmap_atomic(kaddr, KM_USER0);
                 PRINTK("set file bit %lu page %lu\n", bit, page->index);
         }
@@ -1050,7 +1050,7 @@ static int bitmap_init_from_disk(struct bitmap *bitmap, sector_t start)
                 if (bitmap->flags & BITMAP_HOSTENDIAN)
                         b = test_bit(bit, paddr);
                 else
-                        b = ext2_test_bit(bit, paddr);
+                        b = test_bit_le(bit, paddr);
                 kunmap_atomic(paddr, KM_USER0);
                 if (b) {
                         /* if the disk bit is set, set the memory bit */
@@ -1226,7 +1226,7 @@ void bitmap_daemon_work(mddev_t *mddev)
                                                 clear_bit(file_page_offset(bitmap, j),
                                                           paddr);
                                         else
-                                                ext2_clear_bit(file_page_offset(bitmap, j),
+                                                __test_and_clear_bit_le(file_page_offset(bitmap, j),
                                                                paddr);
                                         kunmap_atomic(paddr, KM_USER0);
                                 } else
diff --git a/drivers/md/dm-log-userspace-transfer.c b/drivers/md/dm-log-userspace-transfer.c
index 049eaf12aaab..1f23e048f077 100644
--- a/drivers/md/dm-log-userspace-transfer.c
+++ b/drivers/md/dm-log-userspace-transfer.c
@@ -134,7 +134,7 @@ static void cn_ulog_callback(struct cn_msg *msg, struct netlink_skb_parms *nsp)
 {
         struct dm_ulog_request *tfr = (struct dm_ulog_request *)(msg + 1);
 
-        if (!cap_raised(nsp->eff_cap, CAP_SYS_ADMIN))
+        if (!cap_raised(current_cap(), CAP_SYS_ADMIN))
                 return;
 
         spin_lock(&receiving_list_lock);
diff --git a/drivers/md/dm-log.c b/drivers/md/dm-log.c
index 6951536ea29c..57968eb382c1 100644
--- a/drivers/md/dm-log.c
+++ b/drivers/md/dm-log.c
@@ -251,20 +251,20 @@ struct log_c {
  */
 static inline int log_test_bit(uint32_t *bs, unsigned bit)
 {
-        return ext2_test_bit(bit, (unsigned long *) bs) ? 1 : 0;
+        return test_bit_le(bit, (unsigned long *) bs) ? 1 : 0;
 }
 
 static inline void log_set_bit(struct log_c *l,
                                uint32_t *bs, unsigned bit)
 {
-        ext2_set_bit(bit, (unsigned long *) bs);
+        __test_and_set_bit_le(bit, (unsigned long *) bs);
         l->touched_cleaned = 1;
 }
 
 static inline void log_clear_bit(struct log_c *l,
                                  uint32_t *bs, unsigned bit)
 {
-        ext2_clear_bit(bit, (unsigned long *) bs);
+        __test_and_clear_bit_le(bit, (unsigned long *) bs);
         l->touched_dirtied = 1;
 }
 
@@ -740,7 +740,7 @@ static int core_get_resync_work(struct dm_dirty_log *log, region_t *region)
                 return 0;
 
         do {
-                *region = ext2_find_next_zero_bit(
+                *region = find_next_zero_bit_le(
                                              (unsigned long *) lc->sync_bits,
                                              lc->region_count,
                                              lc->sync_search);
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index b82d28819e2a..4b0b63c290a6 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -1283,24 +1283,22 @@ static int do_end_io(struct multipath *m, struct request *clone,
         if (!error && !clone->errors)
                 return 0;       /* I/O complete */
 
-        if (error == -EOPNOTSUPP)
-                return error;
-
-        if (clone->cmd_flags & REQ_DISCARD)
-                /*
-                 * Pass all discard request failures up.
-                 * FIXME: only fail_path if the discard failed due to a
-                 * transport problem.  This requires precise understanding
-                 * of the underlying failure (e.g. the SCSI sense).
-                 */
+        if (error == -EOPNOTSUPP || error == -EREMOTEIO)
                 return error;
 
         if (mpio->pgpath)
                 fail_path(mpio->pgpath);
 
         spin_lock_irqsave(&m->lock, flags);
-        if (!m->nr_valid_paths && !m->queue_if_no_path && !__must_push_back(m))
-                r = -EIO;
+        if (!m->nr_valid_paths) {
+                if (!m->queue_if_no_path) {
+                        if (!__must_push_back(m))
+                                r = -EIO;
+                } else {
+                        if (error == -EBADE)
+                                r = error;
+                }
+        }
         spin_unlock_irqrestore(&m->lock, flags);
 
         return r;
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 1876761f1828..06ecea751a39 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -7357,7 +7357,7 @@ static int __init md_init(void)
 {
         int ret = -ENOMEM;
 
-        md_wq = alloc_workqueue("md", WQ_RESCUER, 0);
+        md_wq = alloc_workqueue("md", WQ_MEM_RECLAIM, 0);
         if (!md_wq)
                 goto err_wq;