Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML updates from Richard Weinberger:
"Bugfix for the UML block device driver"
* 'for-linus-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: Fix for a possible OOPS in ubd initialization
um: Remove duplicated include from vector_user.c
+3
-6
+3
-3
arch/um/drivers/ubd_kern.c
+3
-3
arch/um/drivers/ubd_kern.c
···
938
938
ubd_dev->queue = blk_mq_init_queue(&ubd_dev->tag_set);
939
939
if (IS_ERR(ubd_dev->queue)) {
940
940
err = PTR_ERR(ubd_dev->queue);
941
-
goto out_cleanup;
941
+
goto out_cleanup_tags;
942
942
}
943
943
944
944
ubd_dev->queue->queuedata = ubd_dev;
···
968
968
969
969
out_cleanup_tags:
970
970
blk_mq_free_tag_set(&ubd_dev->tag_set);
971
-
out_cleanup:
972
-
blk_cleanup_queue(ubd_dev->queue);
971
+
if (!(IS_ERR(ubd_dev->queue)))
972
+
blk_cleanup_queue(ubd_dev->queue);
973
973
goto out;
974
974
}
975
975
-3
arch/um/drivers/vector_user.c
-3
arch/um/drivers/vector_user.c
···
16
16
#include <sys/types.h>
17
17
#include <sys/stat.h>
18
18
#include <fcntl.h>
19
-
#include <sys/types.h>
20
19
#include <sys/socket.h>
21
20
#include <net/ethernet.h>
22
21
#include <netinet/ip.h>
23
22
#include <netinet/ether.h>
24
23
#include <linux/if_ether.h>
25
24
#include <linux/if_packet.h>
26
-
#include <sys/socket.h>
27
25
#include <sys/wait.h>
28
26
#include <sys/uio.h>
29
27
#include <linux/virtio_net.h>
···
29
31
#include <stdlib.h>
30
32
#include <os.h>
31
33
#include <um_malloc.h>
32
-
#include <sys/uio.h>
33
34
#include "vector_user.h"
34
35
35
36
#define ID_GRE 0