Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1393b59f authored by Philipp Reisner's avatar Philipp Reisner
Browse files

drbd: Remove duplicate code 



Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent 70f17b6b

drivers/block/drbd/drbd_receiver.c

+1 −14
Original line number Diff line number Diff line
@@ -490,22 +490,9 @@ static int drbd_recv_short(struct socket *sock, void *buf, size_t size, int flag 


static int drbd_recv(struct drbd_tconn *tconn, void *buf, size_t size)

{

	mm_segment_t oldfs;

	struct kvec iov = {

		.iov_base = buf,

		.iov_len = size,

	};

	struct msghdr msg = {

		.msg_iovlen = 1,

		.msg_iov = (struct iovec *)&iov,

		.msg_flags = MSG_WAITALL | MSG_NOSIGNAL

	};

	int rv;



	oldfs = get_fs();

	set_fs(KERNEL_DS);

	rv = sock_recvmsg(tconn->data.socket, &msg, size, msg.msg_flags);

	set_fs(oldfs);

	rv = drbd_recv_short(tconn->data.socket, buf, size, 0);



	if (rv < 0) {

		if (rv == -ECONNRESET)