mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
c55c7a85e0
The subsequent call to os_set_fd_block() overwrites the previous
return value. OR the two return values together to fix it.
Fixes: f88f0bdfc3 ("um: UBD Improvements")
Signed-off-by: Tiwei Bie <tiwei.btw@antgroup.com>
Link: https://patch.msgid.link/20250606124428.148164-2-tiwei.btw@antgroup.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
78 lines
1.6 KiB
C
78 lines
1.6 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* Copyright (C) 2016 Anton Ivanov (aivanov@brocade.com)
|
|
* Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
|
|
* Copyright (C) 2001 Ridgerun,Inc (glonnon@ridgerun.com)
|
|
*/
|
|
|
|
#include <stddef.h>
|
|
#include <unistd.h>
|
|
#include <errno.h>
|
|
#include <sched.h>
|
|
#include <signal.h>
|
|
#include <string.h>
|
|
#include <netinet/in.h>
|
|
#include <sys/time.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/mman.h>
|
|
#include <sys/param.h>
|
|
#include <endian.h>
|
|
#include <byteswap.h>
|
|
|
|
#include "ubd.h"
|
|
#include <os.h>
|
|
#include <poll.h>
|
|
|
|
static struct pollfd kernel_pollfd;
|
|
|
|
int start_io_thread(struct os_helper_thread **td_out, int *fd_out)
|
|
{
|
|
int fds[2], err;
|
|
|
|
err = os_pipe(fds, 1, 1);
|
|
if(err < 0){
|
|
printk("start_io_thread - os_pipe failed, err = %d\n", -err);
|
|
goto out;
|
|
}
|
|
|
|
kernel_fd = fds[0];
|
|
kernel_pollfd.fd = kernel_fd;
|
|
kernel_pollfd.events = POLLIN;
|
|
*fd_out = fds[1];
|
|
|
|
err = os_set_fd_block(*fd_out, 0);
|
|
err |= os_set_fd_block(kernel_fd, 0);
|
|
if (err) {
|
|
printk("start_io_thread - failed to set nonblocking I/O.\n");
|
|
goto out_close;
|
|
}
|
|
|
|
err = os_run_helper_thread(td_out, io_thread, NULL);
|
|
if (err < 0) {
|
|
printk("%s - failed to run helper thread, err = %d\n",
|
|
__func__, -err);
|
|
goto out_close;
|
|
}
|
|
|
|
return 0;
|
|
|
|
out_close:
|
|
os_close_file(fds[0]);
|
|
os_close_file(fds[1]);
|
|
kernel_fd = -1;
|
|
*fd_out = -1;
|
|
out:
|
|
return err;
|
|
}
|
|
|
|
int ubd_read_poll(int timeout)
|
|
{
|
|
kernel_pollfd.events = POLLIN;
|
|
return poll(&kernel_pollfd, 1, timeout);
|
|
}
|
|
int ubd_write_poll(int timeout)
|
|
{
|
|
kernel_pollfd.events = POLLOUT;
|
|
return poll(&kernel_pollfd, 1, timeout);
|
|
}
|
|
|