11 files changed, 211 insertions, 423 deletions

diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c
index a984964ab70a..bbcedcfc068a 100644
--- a/drivers/target/target_core_file.c
+++ b/drivers/target/target_core_file.c
@@ -244,53 +244,33 @@ static void fd_free_device(void *p)
         kfree(fd_dev);
 }
 
-static inline struct fd_request *FILE_REQ(struct se_task *task)
+static int fd_do_readv(struct se_cmd *cmd, struct scatterlist *sgl,
+                u32 sgl_nents)
 {
-        return container_of(task, struct fd_request, fd_task);
-}
-
-
-static struct se_task *
-fd_alloc_task(unsigned char *cdb)
-{
-        struct fd_request *fd_req;
-
-        fd_req = kzalloc(sizeof(struct fd_request), GFP_KERNEL);
-        if (!fd_req) {
-                pr_err("Unable to allocate struct fd_request\n");
-                return NULL;
-        }
-
-        return &fd_req->fd_task;
-}
-
-static int fd_do_readv(struct se_task *task)
-{
-        struct fd_request *req = FILE_REQ(task);
-        struct se_device *se_dev = req->fd_task.task_se_cmd->se_dev;
+        struct se_device *se_dev = cmd->se_dev;
         struct fd_dev *dev = se_dev->dev_ptr;
         struct file *fd = dev->fd_file;
-        struct scatterlist *sg = task->task_sg;
+        struct scatterlist *sg;
         struct iovec *iov;
         mm_segment_t old_fs;
-        loff_t pos = (task->task_se_cmd->t_task_lba *
+        loff_t pos = (cmd->t_task_lba *
                       se_dev->se_sub_dev->se_dev_attrib.block_size);
         int ret = 0, i;
 
-        iov = kzalloc(sizeof(struct iovec) * task->task_sg_nents, GFP_KERNEL);
+        iov = kzalloc(sizeof(struct iovec) * sgl_nents, GFP_KERNEL);
         if (!iov) {
                 pr_err("Unable to allocate fd_do_readv iov[]\n");
                 return -ENOMEM;
         }
 
-        for_each_sg(task->task_sg, sg, task->task_sg_nents, i) {
+        for_each_sg(sgl, sg, sgl_nents, i) {
                 iov[i].iov_len = sg->length;
                 iov[i].iov_base = sg_virt(sg);
         }
 
         old_fs = get_fs();
         set_fs(get_ds());
-        ret = vfs_readv(fd, &iov[0], task->task_sg_nents, &pos);
+        ret = vfs_readv(fd, &iov[0], sgl_nents, &pos);
         set_fs(old_fs);
 
         kfree(iov);
@@ -300,10 +280,10 @@ static int fd_do_readv(struct se_task *task)
          * block_device.
          */
         if (S_ISBLK(fd->f_dentry->d_inode->i_mode)) {
-                if (ret < 0 || ret != task->task_se_cmd->data_length) {
+                if (ret < 0 || ret != cmd->data_length) {
                         pr_err("vfs_readv() returned %d,"
                                 " expecting %d for S_ISBLK\n", ret,
-                                (int)task->task_se_cmd->data_length);
+                                (int)cmd->data_length);
                         return (ret < 0 ? ret : -EINVAL);
                 }
         } else {
@@ -317,38 +297,38 @@ static int fd_do_readv(struct se_task *task)
         return 1;
 }
 
-static int fd_do_writev(struct se_task *task)
+static int fd_do_writev(struct se_cmd *cmd, struct scatterlist *sgl,
+                u32 sgl_nents)
 {
-        struct fd_request *req = FILE_REQ(task);
-        struct se_device *se_dev = req->fd_task.task_se_cmd->se_dev;
+        struct se_device *se_dev = cmd->se_dev;
         struct fd_dev *dev = se_dev->dev_ptr;
         struct file *fd = dev->fd_file;
-        struct scatterlist *sg = task->task_sg;
+        struct scatterlist *sg;
         struct iovec *iov;
         mm_segment_t old_fs;
-        loff_t pos = (task->task_se_cmd->t_task_lba *
+        loff_t pos = (cmd->t_task_lba *
                       se_dev->se_sub_dev->se_dev_attrib.block_size);
         int ret, i = 0;
 
-        iov = kzalloc(sizeof(struct iovec) * task->task_sg_nents, GFP_KERNEL);
+        iov = kzalloc(sizeof(struct iovec) * sgl_nents, GFP_KERNEL);
         if (!iov) {
                 pr_err("Unable to allocate fd_do_writev iov[]\n");
                 return -ENOMEM;
         }
 
-        for_each_sg(task->task_sg, sg, task->task_sg_nents, i) {
+        for_each_sg(sgl, sg, sgl_nents, i) {
                 iov[i].iov_len = sg->length;
                 iov[i].iov_base = sg_virt(sg);
         }
 
         old_fs = get_fs();
         set_fs(get_ds());
-        ret = vfs_writev(fd, &iov[0], task->task_sg_nents, &pos);
+        ret = vfs_writev(fd, &iov[0], sgl_nents, &pos);
         set_fs(old_fs);
 
         kfree(iov);
 
-        if (ret < 0 || ret != task->task_se_cmd->data_length) {
+        if (ret < 0 || ret != cmd->data_length) {
                 pr_err("vfs_writev() returned %d\n", ret);
                 return (ret < 0 ? ret : -EINVAL);
         }
@@ -369,7 +349,7 @@ static void fd_emulate_sync_cache(struct se_cmd *cmd)
          * for this SYNCHRONIZE_CACHE op
          */
         if (immed)
-                transport_complete_sync_cache(cmd, 1);
+                target_complete_cmd(cmd, SAM_STAT_GOOD);
 
         /*
          * Determine if we will be flushing the entire device.
@@ -389,35 +369,37 @@ static void fd_emulate_sync_cache(struct se_cmd *cmd)
         if (ret != 0)
                 pr_err("FILEIO: vfs_fsync_range() failed: %d\n", ret);
 
-        if (!immed)
-                transport_complete_sync_cache(cmd, ret == 0);
+        if (immed)
+                return;
+
+        if (ret) {
+                cmd->scsi_sense_reason = TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
+                target_complete_cmd(cmd, SAM_STAT_CHECK_CONDITION);
+        } else {
+                target_complete_cmd(cmd, SAM_STAT_GOOD);