Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Vivek Goyal <vgoyal@redhat.com>
To:     virtio-fs@redhat.com, linux-fsdevel@vger.kernel.org,
        linux-kernel@vger.kernel.org
Cc:     vgoyal@redhat.com, stefanha@redhat.com, dgilbert@redhat.com,
        miklos@szeredi.hu
Subject: [PATCH 1/4] virtiofs: Provide a helper function for virtqueue initialization
Date:   Fri, 15 Nov 2019 15:57:02 -0500
Message-Id: <20191115205705.2046-2-vgoyal@redhat.com>
In-Reply-To: <20191115205705.2046-1-vgoyal@redhat.com>
References: <20191115205705.2046-1-vgoyal@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=WINDOWS-1252
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

This reduces code duplication and make it little easier to read code.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
---
 fs/fuse/virtio_fs.c | 50 +++++++++++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c
index b5ba83ef1914..a0fb0a93980c 100644
--- a/fs/fuse/virtio_fs.c
+++ b/fs/fuse/virtio_fs.c
@@ -24,6 +24,8 @@ enum {
 =09VQ_REQUEST
 };
=20
+#define VQ_NAME_LEN=0924
+
 /* Per-virtqueue state */
 struct virtio_fs_vq {
 =09spinlock_t lock;
@@ -36,7 +38,7 @@ struct virtio_fs_vq {
 =09bool connected;
 =09long in_flight;
 =09struct completion in_flight_zero; /* No inflight requests */
-=09char name[24];
+=09char name[VQ_NAME_LEN];
 } ____cacheline_aligned_in_smp;
=20
 /* A virtio-fs device instance */
@@ -560,6 +562,26 @@ static void virtio_fs_vq_done(struct virtqueue *vq)
 =09schedule_work(&fsvq->done_work);
 }
=20
+static void virtio_fs_init_vq(struct virtio_fs_vq *fsvq, char *name,
+=09=09=09      int vq_type)
+{
+=09strncpy(fsvq->name, name, VQ_NAME_LEN);
+=09spin_lock_init(&fsvq->lock);
+=09INIT_LIST_HEAD(&fsvq->queued_reqs);
+=09INIT_LIST_HEAD(&fsvq->end_reqs);
+=09init_completion(&fsvq->in_flight_zero);
+
+=09if (vq_type =3D=3D VQ_REQUEST) {
+=09=09INIT_WORK(&fsvq->done_work, virtio_fs_requests_done_work);
+=09=09INIT_DELAYED_WORK(&fsvq->dispatch_work,
+=09=09=09=09  virtio_fs_request_dispatch_work);
+=09} else {
+=09=09INIT_WORK(&fsvq->done_work, virtio_fs_hiprio_done_work);
+=09=09INIT_DELAYED_WORK(&fsvq->dispatch_work,
+=09=09=09=09  virtio_fs_hiprio_dispatch_work);
+=09}
+}
+
 /* Initialize virtqueues */
 static int virtio_fs_setup_vqs(struct virtio_device *vdev,
 =09=09=09       struct virtio_fs *fs)
@@ -575,7 +597,7 @@ static int virtio_fs_setup_vqs(struct virtio_device *vd=
ev,
 =09if (fs->num_request_queues =3D=3D 0)
 =09=09return -EINVAL;
=20
-=09fs->nvqs =3D 1 + fs->num_request_queues;
+=09fs->nvqs =3D VQ_REQUEST + fs->num_request_queues;
 =09fs->vqs =3D kcalloc(fs->nvqs, sizeof(fs->vqs[VQ_HIPRIO]), GFP_KERNEL);
 =09if (!fs->vqs)
 =09=09return -ENOMEM;
@@ -589,29 +611,17 @@ static int virtio_fs_setup_vqs(struct virtio_device *=
vdev,
 =09=09goto out;
 =09}
=20
+=09/* Initialize the hiprio/forget request virtqueue */
 =09callbacks[VQ_HIPRIO] =3D virtio_fs_vq_done;
-=09snprintf(fs->vqs[VQ_HIPRIO].name, sizeof(fs->vqs[VQ_HIPRIO].name),
-=09=09=09"hiprio");
+=09virtio_fs_init_vq(&fs->vqs[VQ_HIPRIO], "hiprio", VQ_HIPRIO);
 =09names[VQ_HIPRIO] =3D fs->vqs[VQ_HIPRIO].name;
-=09INIT_WORK(&fs->vqs[VQ_HIPRIO].done_work, virtio_fs_hiprio_done_work);
-=09INIT_LIST_HEAD(&fs->vqs[VQ_HIPRIO].queued_reqs);
-=09INIT_LIST_HEAD(&fs->vqs[VQ_HIPRIO].end_reqs);
-=09INIT_DELAYED_WORK(&fs->vqs[VQ_HIPRIO].dispatch_work,
-=09=09=09virtio_fs_hiprio_dispatch_work);
-=09init_completion(&fs->vqs[VQ_HIPRIO].in_flight_zero);
-=09spin_lock_init(&fs->vqs[VQ_HIPRIO].lock);
=20
 =09/* Initialize the requests virtqueues */
 =09for (i =3D VQ_REQUEST; i < fs->nvqs; i++) {
-=09=09spin_lock_init(&fs->vqs[i].lock);
-=09=09INIT_WORK(&fs->vqs[i].done_work, virtio_fs_requests_done_work);
-=09=09INIT_DELAYED_WORK(&fs->vqs[i].dispatch_work,
-=09=09=09=09  virtio_fs_request_dispatch_work);
-=09=09INIT_LIST_HEAD(&fs->vqs[i].queued_reqs);
-=09=09INIT_LIST_HEAD(&fs->vqs[i].end_reqs);
-=09=09init_completion(&fs->vqs[i].in_flight_zero);
-=09=09snprintf(fs->vqs[i].name, sizeof(fs->vqs[i].name),
-=09=09=09 "requests.%u", i - VQ_REQUEST);
+=09=09char vq_name[VQ_NAME_LEN];
+
+=09=09snprintf(vq_name, VQ_NAME_LEN, "requests.%u", i - VQ_REQUEST);
+=09=09virtio_fs_init_vq(&fs->vqs[i], vq_name, VQ_REQUEST);
 =09=09callbacks[i] =3D virtio_fs_vq_done;
 =09=09names[i] =3D fs->vqs[i].name;
 =09}
--=20
2.20.1