From: Stefan Hajnoczi <stefanha@redhat.com>
To: Miklos Szeredi <mszeredi@redhat.com>
Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
vgoyal@redhat.com, linux-fsdevel@vger.kernel.org,
Stefan Hajnoczi <stefanha@redhat.com>
Subject: [PATCH] virtio-fs: rename num_queues to num_request_queues
Date: Tue, 17 Sep 2019 12:44:57 +0100 [thread overview]
Message-ID: <20190917114457.886-1-stefanha@redhat.com> (raw)
The final version of the virtio-fs device specification renamed the
num_queues field to num_request_queues. The semantics are unchanged but
this name is clearer.
Use the new name in the code.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
Feel free to squash this patch.
---
include/uapi/linux/virtio_fs.h | 2 +-
fs/fuse/virtio_fs.c | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/uapi/linux/virtio_fs.h b/include/uapi/linux/virtio_fs.h
index b5e99c217c86..b02eb2ac3d99 100644
--- a/include/uapi/linux/virtio_fs.h
+++ b/include/uapi/linux/virtio_fs.h
@@ -13,7 +13,7 @@ struct virtio_fs_config {
__u8 tag[36];
/* Number of request queues */
- __u32 num_queues;
+ __u32 num_request_queues;
} __attribute__((packed));
#endif /* _UAPI_LINUX_VIRTIO_FS_H */
diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c
index 392b9e7d9ddf..ccfa4f741f7f 100644
--- a/fs/fuse/virtio_fs.c
+++ b/fs/fuse/virtio_fs.c
@@ -43,8 +43,8 @@ struct virtio_fs {
struct list_head list; /* on virtio_fs_instances */
char *tag;
struct virtio_fs_vq *vqs;
- unsigned int nvqs; /* number of virtqueues */
- unsigned int num_queues; /* number of request queues */
+ unsigned int nvqs; /* number of virtqueues */
+ unsigned int num_request_queues; /* number of request queues */
};
struct virtio_fs_forget {
@@ -477,12 +477,12 @@ static int virtio_fs_setup_vqs(struct virtio_device *vdev,
unsigned int i;
int ret = 0;
- virtio_cread(vdev, struct virtio_fs_config, num_queues,
- &fs->num_queues);
- if (fs->num_queues == 0)
+ virtio_cread(vdev, struct virtio_fs_config, num_request_queues,
+ &fs->num_request_queues);
+ if (fs->num_request_queues == 0)
return -EINVAL;
- fs->nvqs = 1 + fs->num_queues;
+ fs->nvqs = 1 + fs->num_request_queues;
fs->vqs = kcalloc(fs->nvqs, sizeof(fs->vqs[VQ_HIPRIO]), GFP_KERNEL);
if (!fs->vqs)
return -ENOMEM;
--
2.21.0
next reply other threads:[~2019-09-17 11:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-17 11:44 Stefan Hajnoczi [this message]
2019-09-18 16:48 ` [PATCH] virtio-fs: rename num_queues to num_request_queues Dr. David Alan Gilbert
2019-09-18 18:22 ` Miklos Szeredi
2019-09-25 14:23 ` Michael S. Tsirkin
2019-09-25 14:31 ` Miklos Szeredi
2019-09-30 9:48 ` Dr. David Alan Gilbert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190917114457.886-1-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=dgilbert@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=mszeredi@redhat.com \
--cc=vgoyal@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).