1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c
index 1f784fde2510..494474779532 100644
--- a/drivers/scsi/mesh.c
+++ b/drivers/scsi/mesh.c
@@ -415,8 +415,7 @@ static void mesh_start_cmd(struct mesh_state *ms, struct scsi_cmnd *cmd)
 #if 1
         if (DEBUG_TARGET(cmd)) {
                 int i;
-                printk(KERN_DEBUG "mesh_start: %p ser=%lu tgt=%d cmd=",
-                       cmd, cmd->serial_number, id);
+                printk(KERN_DEBUG "mesh_start: %p tgt=%d cmd=", cmd, id);
                 for (i = 0; i < cmd->cmd_len; ++i)
                         printk(" %x", cmd->cmnd[i]);
                 printk(" use_sg=%d buffer=%p bufflen=%u\n",
@@ -1627,7 +1626,7 @@ static void cmd_complete(struct mesh_state *ms)
  * Called by midlayer with host locked to queue a new
  * request
  */
-static int mesh_queue(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
+static int mesh_queue_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
 {
         struct mesh_state *ms;
 
@@ -1648,6 +1647,8 @@ static int mesh_queue(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
         return 0;
 }
 
+static DEF_SCSI_QCMD(mesh_queue)
+
 /*
  * Called to handle interrupts, either call by the interrupt
  * handler (do_mesh_interrupt) or by other functions in