queue-5.1/nvme-tcp-rename-function-to-have-nvme_tcp-prefix.patch

   1 From efb973b19b88642bb7e08b8ce8e03b0bbd2a7e2a Mon Sep 17 00:00:00 2001
   2 From: Sagi Grimberg <sagi@grimberg.me>
   3 Date: Wed, 24 Apr 2019 11:53:19 -0700
   4 Subject: nvme-tcp: rename function to have nvme_tcp prefix
   5
   6 From: Sagi Grimberg <sagi@grimberg.me>
   7
   8 commit efb973b19b88642bb7e08b8ce8e03b0bbd2a7e2a upstream.
   9
  10 usually nvme_ prefix is for core functions.
  11 While we're cleaning up, remove redundant empty lines
  12
  13 Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
  14 Reviewed-by: Minwoo Im <minwoo.im@samsung.com>
  15 Signed-off-by: Christoph Hellwig <hch@lst.de>
  16 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  17
  18 ---
  19  drivers/nvme/host/tcp.c |   10 ++++------
  20  1 file changed, 4 insertions(+), 6 deletions(-)
  21
  22 --- a/drivers/nvme/host/tcp.c
  23 +++ b/drivers/nvme/host/tcp.c
  24 @@ -473,7 +473,6 @@ static int nvme_tcp_handle_c2h_data(stru
  25         }
  26
  27         return 0;
  28 -
  29  }
  30
  31  static int nvme_tcp_handle_comp(struct nvme_tcp_queue *queue,
  32 @@ -634,7 +633,6 @@ static inline void nvme_tcp_end_request(
  33         nvme_end_request(rq, cpu_to_le16(status << 1), res);
  34  }
  35
  36 -
  37  static int nvme_tcp_recv_data(struct nvme_tcp_queue *queue, struct sk_buff *skb,
  38                               unsigned int *offset, size_t *len)
  39  {
  40 @@ -1535,7 +1533,7 @@ out_free_queue:
  41         return ret;
  42  }
  43
  44 -static int nvme_tcp_alloc_io_queues(struct nvme_ctrl *ctrl)
  45 +static int __nvme_tcp_alloc_io_queues(struct nvme_ctrl *ctrl)
  46  {
  47         int i, ret;
  48
  49 @@ -1565,7 +1563,7 @@ static unsigned int nvme_tcp_nr_io_queue
  50         return nr_io_queues;
  51  }
  52
  53 -static int nvme_alloc_io_queues(struct nvme_ctrl *ctrl)
  54 +static int nvme_tcp_alloc_io_queues(struct nvme_ctrl *ctrl)
  55  {
  56         unsigned int nr_io_queues;
  57         int ret;
  58 @@ -1582,7 +1580,7 @@ static int nvme_alloc_io_queues(struct n
  59         dev_info(ctrl->device,
  60                 "creating %d I/O queues.\n", nr_io_queues);
  61
  62 -       return nvme_tcp_alloc_io_queues(ctrl);
  63 +       return __nvme_tcp_alloc_io_queues(ctrl);
  64  }
  65
  66  static void nvme_tcp_destroy_io_queues(struct nvme_ctrl *ctrl, bool remove)
  67 @@ -1599,7 +1597,7 @@ static int nvme_tcp_configure_io_queues(
  68  {
  69         int ret;
  70
  71 -       ret = nvme_alloc_io_queues(ctrl);
  72 +       ret = nvme_tcp_alloc_io_queues(ctrl);
  73         if (ret)
  74                 return ret;
  75