block: remove wrappers for request type/flags

[mirror_ubuntu-bionic-kernel.git] / drivers / block / osdblk.c

diff --git a/drivers/block/osdblk.c b/drivers/block/osdblk.c
index a808b1530b3bd344c290e0fed84e5d35e72d8338..819002ba34338e8d0e80ed907d67ee2bb1b4b64e 100644 (file)
--- a/drivers/block/osdblk.c
+++ b/drivers/block/osdblk.c
@@ -63,6 +63,7 @@
 #include <linux/device.h>
 #include <linux/module.h>
 #include <linux/fs.h>
+#include <linux/slab.h>
 #include <scsi/osd_initiator.h>
 #include <scsi/osd_attributes.h>
 #include <scsi/osd_sec.h>
@@ -309,7 +310,8 @@ static void osdblk_rq_fn(struct request_queue *q)
                        break;
 
                /* filter out block requests we don't understand */
-               if (!blk_fs_request(rq) && !blk_barrier_rq(rq)) {
+               if (rq->cmd_type != REQ_TYPE_FS &&
+                   !(rq->cmd_flags & REQ_HARDBARRIER)) {
                        blk_end_request_all(rq, 0);
                        continue;
                }
@@ -476,7 +478,9 @@ static void class_osdblk_release(struct class *cls)
        kfree(cls);
 }
 
-static ssize_t class_osdblk_list(struct class *c, char *data)
+static ssize_t class_osdblk_list(struct class *c,
+                               struct class_attribute *attr,
+                               char *data)
 {
        int n = 0;
        struct list_head *tmp;
@@ -500,7 +504,9 @@ static ssize_t class_osdblk_list(struct class *c, char *data)
        return n;
 }
 
-static ssize_t class_osdblk_add(struct class *c, const char *buf, size_t count)
+static ssize_t class_osdblk_add(struct class *c,
+                               struct class_attribute *attr,
+                               const char *buf, size_t count)
 {
        struct osdblk_device *osdev;
        ssize_t rc;
@@ -592,7 +598,9 @@ err_out_mod:
        return rc;
 }
 
-static ssize_t class_osdblk_remove(struct class *c, const char *buf,
+static ssize_t class_osdblk_remove(struct class *c,
+                                       struct class_attribute *attr,
+                                       const char *buf,
                                        size_t count)
 {
        struct osdblk_device *osdev = NULL;