OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-6.1/block-2022-10-03' of git://git.kernel.dk/linux
[tomoyo/tomoyo-test1.git]
/
drivers
/
block
/
virtio_blk.c
diff --git
a/drivers/block/virtio_blk.c
b/drivers/block/virtio_blk.c
index
dd9a051
..
3f4739d
100644
(file)
--- a/
drivers/block/virtio_blk.c
+++ b/
drivers/block/virtio_blk.c
@@
-801,7
+801,7
@@
static const struct attribute_group *virtblk_attr_groups[] = {
NULL,
};
NULL,
};
-static
int
virtblk_map_queues(struct blk_mq_tag_set *set)
+static
void
virtblk_map_queues(struct blk_mq_tag_set *set)
{
struct virtio_blk *vblk = set->driver_data;
int i, qoff;
{
struct virtio_blk *vblk = set->driver_data;
int i, qoff;
@@
-826,8
+826,6
@@
static int virtblk_map_queues(struct blk_mq_tag_set *set)
else
blk_mq_virtio_map_queues(&set->map[i], vblk->vdev, 0);
}
else
blk_mq_virtio_map_queues(&set->map[i], vblk->vdev, 0);
}
-
- return 0;
}
static void virtblk_complete_batch(struct io_comp_batch *iob)
}
static void virtblk_complete_batch(struct io_comp_batch *iob)