Commit 6c83d0d5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 636deed6 aea05eb5

arch/um/drivers/ubd_kern.c

+3 −3
Original line number Diff line number Diff line
@@ -938,7 +938,7 @@ static int ubd_add(int n, char **error_out) 
	ubd_dev->queue = blk_mq_init_queue(&ubd_dev->tag_set);

	if (IS_ERR(ubd_dev->queue)) {

		err = PTR_ERR(ubd_dev->queue);

		goto out_cleanup;

		goto out_cleanup_tags;

	}



	ubd_dev->queue->queuedata = ubd_dev;
@@ -968,7 +968,7 @@ out: 


out_cleanup_tags:

	blk_mq_free_tag_set(&ubd_dev->tag_set);

out_cleanup:

	if (!(IS_ERR(ubd_dev->queue)))

		blk_cleanup_queue(ubd_dev->queue);

	goto out;

}

arch/um/drivers/vector_user.c

+0 −3
Original line number Diff line number Diff line
@@ -16,14 +16,12 @@ 
#include <sys/types.h>

#include <sys/stat.h>

#include <fcntl.h>

#include <sys/types.h>

#include <sys/socket.h>

#include <net/ethernet.h>

#include <netinet/ip.h>

#include <netinet/ether.h>

#include <linux/if_ether.h>

#include <linux/if_packet.h>

#include <sys/socket.h>

#include <sys/wait.h>

#include <sys/uio.h>

#include <linux/virtio_net.h>
@@ -31,7 +29,6 @@ 
#include <stdlib.h>

#include <os.h>

#include <um_malloc.h>

#include <sys/uio.h>

#include "vector_user.h"



#define ID_GRE 0

CRA Git | Maintained and supported by SUSTech CRA and CCSE