virtio-fs: rename num_queues to num_request_queues
Subsystems (4)
Stefan Hajnoczi
maintainerPATCH 1/1 virtio-fs: rename num_queues to num_request_queues
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.
---
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(-)
include/uapi/linux/virtio_fs.h +1 -1
@@ -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 */
fs/fuse/virtio_fs.c +6 -6
@@ -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 ;
Signature · 1 line
2.21.0
Quoted 7 lines · * Stefan Hajnoczi ([email protected]) wrote:
The final version of the virtio-fs device specification renamed the
num_queuesfield tonum_request_queues. The semantics are unchanged but this name is clearer.Use the new name in the code.
Signed-off-by Stefan Hajnoczi <[email protected]>
Consistent with the latest version that's just passed the voting; (see
https://lists.oasis-open.org/archives/virtio-dev/201908/msg00113.html ) so:
Quoted 55 lines
---
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(-)include/uapi/linux/virtio_fs.h +1
-1@@ -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 */ fs/fuse/virtio_fs.c +6
-6@@ -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 ;Signature · 1 line
2.21.0
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Miklos Szeredi
maintainerQuoted 10 lines · Dr. David Alan Gilbert
Quoted 7 lines · * Stefan Hajnoczi ([email protected]) wrote:
The final version of the virtio-fs device specification renamed the
num_queuesfield tonum_request_queues. The semantics are unchanged but this name is clearer.Use the new name in the code.
Signed-off-by Stefan Hajnoczi <[email protected]>
Quoted 10 lines
Consistent with the latest version that's just passed the voting; (see
https://lists.oasis-open.org/archives/virtio-dev/201908/msg00113.html ) so:Reviewed-by Dr. David Alan Gilbert <[email protected]>Quoted 2 lines
---
Feel free to squash this patch.
Thanks, folded this one as well.
Miklos
Michael S. Tsirkin
maintainerQuoted 18 lines · Miklos Szeredi
Quoted 16 lines · Dr. David Alan Gilbert
Quoted 7 lines · * Stefan Hajnoczi ([email protected]) wrote:
The final version of the virtio-fs device specification renamed the
num_queuesfield tonum_request_queues. The semantics are unchanged but this name is clearer.Use the new name in the code.
Signed-off-by Stefan Hajnoczi <[email protected]>Consistent with the latest version that's just passed the voting; (see
https://lists.oasis-open.org/archives/virtio-dev/201908/msg00113.html ) so:
Quoted 8 lines
Quoted 4 lines
Reviewed-by Dr. David Alan Gilbert <[email protected]>Quoted 2 lines
---
Feel free to squash this patch.Thanks, folded this one as well.
Miklos
So what's the plan for merging all this?
Doesn't look like it was sent in the merge window, nor is it in linux-next.
Signature · 1 line
MST
Quoted 25 lines · Michael S. Tsirkin
Quoted 23 lines · Miklos Szeredi
Quoted 20 lines · Dr. David Alan Gilbert
Quoted 7 lines · * Stefan Hajnoczi ([email protected]) wrote:
The final version of the virtio-fs device specification renamed the
num_queuesfield tonum_request_queues. The semantics are unchanged but this name is clearer.Use the new name in the code.
Signed-off-by Stefan Hajnoczi <[email protected]>Consistent with the latest version that's just passed the voting; (see
https://lists.oasis-open.org/archives/virtio-dev/201908/msg00113.html ) so:Reviewed-by Dr. David Alan Gilbert <[email protected]>Quoted 2 lines
---
Feel free to squash this patch.
Quoted 7 lines
Quoted 3 lines
Thanks, folded this one as well.
Miklos
So what's the plan for merging all this?
Doesn't look like it was sent in the merge window, nor is it in linux-next.
It should be.
Sent pull request for fuse update today; this includes changes required for virtio-fs. Planning to send pull request for virtio-fs itself tomorrow.
Thanks,
Miklos
Quoted 24 lines · * Michael S. Tsirkin ([email protected]) wrote:
Quoted 23 lines · Miklos Szeredi
Quoted 20 lines · Dr. David Alan Gilbert
Quoted 7 lines · * Stefan Hajnoczi ([email protected]) wrote:
The final version of the virtio-fs device specification renamed the
num_queuesfield tonum_request_queues. The semantics are unchanged but this name is clearer.Use the new name in the code.
Signed-off-by Stefan Hajnoczi <[email protected]>Consistent with the latest version that's just passed the voting; (see
https://lists.oasis-open.org/archives/virtio-dev/201908/msg00113.html ) so:Reviewed-by Dr. David Alan Gilbert <[email protected]>Quoted 2 lines
---
Feel free to squash this patch.
Quoted 7 lines
Quoted 3 lines
Thanks, folded this one as well.
Miklos
So what's the plan for merging all this?
Doesn't look like it was sent in the merge window, nor is it in linux-next.
It's in the version that got merged upstream over the weekend.
Dave
Quoted 2 lines
Signature · 1 line
MST
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK