iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-linus-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

Browse Source 
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
This commit is contained in:
Linus Torvalds 2019-03-15 15:07:32 -07:00
commit 6c83d0d5eb
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/um/drivers/ubd_kern.c
View File

@ -938,7 +938,7 @@ static int ubd_add(int n, char **error_out)
ubd_dev->queue = blk_mq_init_queue(&ubd_dev->tag_set); ubd_dev->queue = blk_mq_init_queue(&ubd_dev->tag_set);
if (IS_ERR(ubd_dev->queue)) { if (IS_ERR(ubd_dev->queue)) {
err = PTR_ERR(ubd_dev->queue); err = PTR_ERR(ubd_dev->queue);
goto out_cleanup; goto out_cleanup_tags;
} }
ubd_dev->queue->queuedata = ubd_dev; ubd_dev->queue->queuedata = ubd_dev;
@ -968,8 +968,8 @@ out:
out_cleanup_tags: out_cleanup_tags:
blk_mq_free_tag_set(&ubd_dev->tag_set); blk_mq_free_tag_set(&ubd_dev->tag_set);
out_cleanup: if (!(IS_ERR(ubd_dev->queue)))
blk_cleanup_queue(ubd_dev->queue); blk_cleanup_queue(ubd_dev->queue);
goto out; goto out;
} }

3
arch/um/drivers/vector_user.c
View File

@ -16,14 +16,12 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <net/ethernet.h> #include <net/ethernet.h>
#include <netinet/ip.h> #include <netinet/ip.h>
#include <netinet/ether.h> #include <netinet/ether.h>
#include <linux/if_ether.h> #include <linux/if_ether.h>
#include <linux/if_packet.h> #include <linux/if_packet.h>
#include <sys/socket.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <linux/virtio_net.h> #include <linux/virtio_net.h>
@ -31,7 +29,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <os.h> #include <os.h>
#include <um_malloc.h> #include <um_malloc.h>
#include <sys/uio.h>
#include "vector_user.h" #include "vector_user.h"
#define ID_GRE 0 #define ID_GRE 0