Commit a3ec6005 authored by Jens Axboe's avatar Jens Axboe
Browse files

io_uring: move io_uring_get_socket() into io_uring.h 



Now we have a io_uring kernel header, move this definition out of fs.h
and into io_uring.h where it belongs.

Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 9b828492

include/linux/fs.h

+0 −9
Original line number Diff line number Diff line
@@ -3514,15 +3514,6 @@ extern int vfs_fadvise(struct file *file, loff_t offset, loff_t len, 
extern int generic_fadvise(struct file *file, loff_t offset, loff_t len,

			   int advice);



#if defined(CONFIG_IO_URING)

extern struct sock *io_uring_get_socket(struct file *file);

#else

static inline struct sock *io_uring_get_socket(struct file *file)

{

	return NULL;

}

#endif



int vfs_ioc_setflags_prepare(struct inode *inode, unsigned int oldflags,

			     unsigned int flags);

include/linux/io_uring.h

+5 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ struct io_uring_task { 
};



#if defined(CONFIG_IO_URING)

struct sock *io_uring_get_socket(struct file *file);

void __io_uring_task_cancel(void);

void __io_uring_files_cancel(struct files_struct *files);

void __io_uring_free(struct task_struct *tsk);
@@ -39,6 +40,10 @@ static inline void io_uring_free(struct task_struct *tsk) 
		__io_uring_free(tsk);

}

#else

static inline struct sock *io_uring_get_socket(struct file *file)

{

	return NULL;

}

static inline void io_uring_task_cancel(void)

{

}

net/unix/scm.c

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <net/af_unix.h>

#include <net/scm.h>

#include <linux/init.h>

#include <linux/io_uring.h>



#include "scm.h"