Re: [PATCH v2 5/8] pipe: simplify logic in alloc_pipe_info()

[Vegard Nossum <vegard.nossum@oracle.com>]

On 08/29/2016 02:21 AM, Michael Kerrisk (man-pages) wrote:
> Replace an 'if' block that covers most of the code in this function
> with a 'goto'. This makes the code a little simpler to read, and also
> simplifies the next patch (fix limit checking in alloc_pipe_info())
>
> Cc: Willy Tarreau <w@1wt.eu>
> Cc: Vegard Nossum <vegard.nossum@oracle.com>
> Cc: socketpair@gmail.com
> Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
> Cc: Jens Axboe <axboe@fb.com>
> Cc: Al Viro <viro@zeniv.linux.org.uk>
> Cc: linux-api@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
> ---
>  fs/pipe.c | 45 +++++++++++++++++++++++----------------------
>  1 file changed, 23 insertions(+), 22 deletions(-)
>
> diff --git a/fs/pipe.c b/fs/pipe.c
> index f45a173..256fc5a 100644
> --- a/fs/pipe.c
> +++ b/fs/pipe.c
> @@ -625,33 +625,34 @@ static bool too_many_pipe_buffers_hard(struct user_struct *user)
>  struct pipe_inode_info *alloc_pipe_info(void)
>  {
>  	struct pipe_inode_info *pipe;
> +	unsigned long pipe_bufs = PIPE_DEF_BUFFERS;
> +	struct user_struct *user = get_current_user();
>
>  	pipe = kzalloc(sizeof(struct pipe_inode_info), GFP_KERNEL_ACCOUNT);
> -	if (pipe) {
> -		unsigned long pipe_bufs = PIPE_DEF_BUFFERS;
> -		struct user_struct *user = get_current_user();
> -
> -		if (!too_many_pipe_buffers_hard(user)) {
> -			if (too_many_pipe_buffers_soft(user))
> -				pipe_bufs = 1;
> -			pipe->bufs = kcalloc(pipe_bufs,
> -					     sizeof(struct pipe_buffer),
> -					     GFP_KERNEL_ACCOUNT);
> -		}
> +	if (pipe == NULL)
> +		goto out_free_uid;

if (!pipe) would probably be more canonical, but I don't know anybody
really cares.


Vegard