Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fs/pipe: move check to pipe_has_watch_queue()

Browse source 
[ Upstream commit b4bd6b4bac8edd61eb8f7b836969d12c0c6af165 ]

This declutters the code by reducing the number of #ifdefs and makes
the watch_queue checks simpler.  This has no runtime effect; the
machine code is identical.

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
Message-Id: <20230921075755.1378787-2-max.kellermann@ionos.com>
Reviewed-by: David Howells <dhowells@redhat.com>
Signed-off-by: Christian Brauner <brauner@kernel.org>
Stable-dep-of: e95aada4cb93 ("pipe: wakeup wr_wait after setting max_usage")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Max Kellermann 2023-09-21 09:57:53 +02:00 committed by Ksawlii
parent 8a300228c4
commit 168f3a8bc1
2 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
fs/pipe.c
View file

@ -437,12 +437,10 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
goto out; goto out;
} }
#ifdef CONFIG_WATCH_QUEUE if (pipe_has_watch_queue(pipe)) {
if (pipe->watch_queue) {
ret = -EXDEV; ret = -EXDEV;
goto out; goto out;
} }
#endif
/* /*
* Epoll nonsensically wants a wakeup whether the pipe * Epoll nonsensically wants a wakeup whether the pipe
@ -1320,10 +1318,8 @@ static long pipe_set_size(struct pipe_inode_info *pipe, unsigned long arg)
unsigned int nr_slots, size; unsigned int nr_slots, size;
long ret = 0; long ret = 0;
#ifdef CONFIG_WATCH_QUEUE if (pipe_has_watch_queue(pipe))
if (pipe->watch_queue)
return -EBUSY; return -EBUSY;
#endif
size = round_pipe_size(arg); size = round_pipe_size(arg);
nr_slots = size >> PAGE_SHIFT; nr_slots = size >> PAGE_SHIFT;
@ -1376,10 +1372,8 @@ struct pipe_inode_info *get_pipe_info(struct file *file, bool for_splice)
if (file->f_op != &pipefifo_fops || !pipe) if (file->f_op != &pipefifo_fops || !pipe)
return NULL; return NULL;
#ifdef CONFIG_WATCH_QUEUE if (for_splice && pipe_has_watch_queue(pipe))
if (for_splice && pipe->watch_queue)
return NULL; return NULL;
#endif
return pipe; return pipe;
} }

16
include/linux/pipe_fs_i.h
View file

@ -122,6 +122,22 @@ struct pipe_buf_operations {
bool (*get)(struct pipe_inode_info *, struct pipe_buffer *); bool (*get)(struct pipe_inode_info *, struct pipe_buffer *);
}; };
/**
* pipe_has_watch_queue - Check whether the pipe is a watch_queue,
* i.e. it was created with O_NOTIFICATION_PIPE
* @pipe: The pipe to check
*
* Return: true if pipe is a watch queue, false otherwise.
*/
static inline bool pipe_has_watch_queue(const struct pipe_inode_info *pipe)
{
#ifdef CONFIG_WATCH_QUEUE
return pipe->watch_queue != NULL;
#else
return false;
#endif
}
/** /**
* pipe_empty - Return true if the pipe is empty * pipe_empty - Return true if the pipe is empty
* @head: The pipe ring head pointer * @head: The pipe ring head pointer