Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[sfrench/cifs-2.6.git] / drivers / target / target_core_user.c

diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c
index 4bba10e7755aa726282a7eec30efc70026474447..fbb6ffaddfbe4d9b41617bc9040843abf7be7dd1 100644 (file)
--- a/drivers/target/target_core_user.c
+++ b/drivers/target/target_core_user.c
@@ -121,7 +121,7 @@ struct tcmu_dev {
 #define TCMU_DEV_BIT_BROKEN 1
 #define TCMU_DEV_BIT_BLOCKED 2
 #define TCMU_DEV_BIT_TMR_NOTIFY 3
-#define TCM_DEV_BIT_PLUGGED 4
+#define TCMU_DEV_BIT_PLUGGED 4
        unsigned long flags;
 
        struct uio_info uio_info;
@@ -982,7 +982,7 @@ static void tcmu_unplug_device(struct se_dev_plug *se_plug)
        struct se_device *se_dev = se_plug->se_dev;
        struct tcmu_dev *udev = TCMU_DEV(se_dev);
 
-       clear_bit(TCM_DEV_BIT_PLUGGED, &udev->flags);
+       clear_bit(TCMU_DEV_BIT_PLUGGED, &udev->flags);
        uio_event_notify(&udev->uio_info);
 }
 
@@ -990,7 +990,7 @@ static struct se_dev_plug *tcmu_plug_device(struct se_device *se_dev)
 {
        struct tcmu_dev *udev = TCMU_DEV(se_dev);
 
-       if (!test_and_set_bit(TCM_DEV_BIT_PLUGGED, &udev->flags))
+       if (!test_and_set_bit(TCMU_DEV_BIT_PLUGGED, &udev->flags))
                return &udev->se_plug;
 
        return NULL;
@@ -1124,7 +1124,7 @@ static int queue_cmd_ring(struct tcmu_cmd *tcmu_cmd, sense_reason_t *scsi_err)
 
        list_add_tail(&tcmu_cmd->queue_entry, &udev->inflight_queue);
 
-       if (!test_bit(TCM_DEV_BIT_PLUGGED, &udev->flags))
+       if (!test_bit(TCMU_DEV_BIT_PLUGGED, &udev->flags))
                uio_event_notify(&udev->uio_info);
 
        return 0;
@@ -1423,7 +1423,7 @@ static bool tcmu_handle_completions(struct tcmu_dev *udev)
 
        if (test_bit(TCMU_DEV_BIT_BROKEN, &udev->flags)) {
                pr_err("ring broken, not handling completions\n");
-               return 0;
+               return false;
        }
 
        mb = udev->mb_addr;