projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pm-opp'
[linux-2.6-microblaze.git]
/
include
/
linux
/
io_uring.h
diff --git
a/include/linux/io_uring.h
b/include/linux/io_uring.h
index
04b650b
..
649a4d7
100644
(file)
--- a/
include/linux/io_uring.h
+++ b/
include/linux/io_uring.h
@@
-7,17
+7,18
@@
#if defined(CONFIG_IO_URING)
struct sock *io_uring_get_socket(struct file *file);
#if defined(CONFIG_IO_URING)
struct sock *io_uring_get_socket(struct file *file);
-void __io_uring_cancel(
struct files_struct *files
);
+void __io_uring_cancel(
bool cancel_all
);
void __io_uring_free(struct task_struct *tsk);
void __io_uring_free(struct task_struct *tsk);
-static inline void io_uring_files_cancel(
struct files_struct *files
)
+static inline void io_uring_files_cancel(
void
)
{
if (current->io_uring)
{
if (current->io_uring)
- __io_uring_cancel(f
iles
);
+ __io_uring_cancel(f
alse
);
}
static inline void io_uring_task_cancel(void)
{
}
static inline void io_uring_task_cancel(void)
{
- return io_uring_files_cancel(NULL);
+ if (current->io_uring)
+ __io_uring_cancel(true);
}
static inline void io_uring_free(struct task_struct *tsk)
{
}
static inline void io_uring_free(struct task_struct *tsk)
{
@@
-32,7
+33,7
@@
static inline struct sock *io_uring_get_socket(struct file *file)
static inline void io_uring_task_cancel(void)
{
}
static inline void io_uring_task_cancel(void)
{
}
-static inline void io_uring_files_cancel(
struct files_struct *files
)
+static inline void io_uring_files_cancel(
void
)
{
}
static inline void io_uring_free(struct task_struct *tsk)
{
}
static inline void io_uring_free(struct task_struct *tsk)