virtio_blk: temporary variable type tweak
Subsystems (3)
Michael S. Tsirkin
maintainerPATCH 1/1 virtio_blk: temporary variable type tweak
virtblk_result returns blk_status_t which is a bitwise restricted type, so we are not supposed to stuff it in a plain int temporary variable. All we do with it is pass it on to a function expecting blk_status_t so the generated code is ok, but we get warnings from sparse:
drivers/block/virtio_blk.c:326:36: sparse: sparse: incorrect type in initializer (different base types) @@ expected int status @@
+got restricted blk_status_t @@drivers/block/virtio_blk.c:334:33: sparse: sparse: incorrect type in argument 2 (different base types) @@ expected restricted
+blk_status_t [usertype] error @@ got int status @@
Make sparse happy by using the correct type.
--- drivers/block/virtio_blk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/virtio_blk.c +1 -1
@@ -336,7 +336,7 @@ static blk_status_t virtblk_setup_cmd(struct virtio_device *vdev,static inline void virtblk_request_done (struct request *req) {struct virtblk_req *vbr =blk_mq_rq_to_pdu (req); -int status =virtblk_result (vbr->status); +blk_status_t status =virtblk_result (vbr->status);virtblk_unmap_data (req, vbr);virtblk_cleanup_cmd (req);
Signature · 6 lines
MST _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Quoted 10 lines · Michael S. Tsirkin
virtblk_resultreturnsblk_status_twhich is a bitwise restricted type, so we are not supposed to stuff it in a plain int temporary variable. All we do with it is pass it on to a function expectingblk_status_tso the generated code is ok, but we get warnings from sparse:
drivers/block/virtio_blk.c:326:36: sparse: sparse: incorrect type in initializer (different base types) @@ expected int status @@
+got restrictedblk_status_t@@drivers/block/virtio_blk.c:334:33: sparse: sparse: incorrect type in argument 2 (different base types) @@ expected restricted
+blk_status_t [usertype] error @@ got int status @@
Quoted 6 lines
Make sparse happy by using the correct type.
Signed-off-by Michael S. Tsirkin <[email protected]>--- drivers/block/virtio_blk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Quoted 5 lines · Michael S. Tsirkin
virtblk_resultreturnsblk_status_twhich is a bitwise restricted type, so we are not supposed to stuff it in a plain int temporary variable. All we do with it is pass it on to a function expectingblk_status_tso the generated code is ok, but we get warnings from sparse:
Quoted 8 lines
drivers/block/virtio_blk.c:326:36: sparse: sparse: incorrect type in initializer (different base types) @@ expected int status @@
+got restrictedblk_status_t@@drivers/block/virtio_blk.c:334:33: sparse: sparse: incorrect type in argument 2 (different base types) @@ expected restricted
+blk_status_t [usertype] error @@ got int status @@Make sparse happy by using the correct type.
Signed-off-by Michael S. Tsirkin <[email protected]>
-ck