Commit 09b4d199 authored Oct 11, 2016 by Michael Kerrisk (man-pages) Committed by Linus Torvalds Oct 11, 2016

pipe: simplify logic in alloc_pipe_info()

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())

Link: http://lkml.kernel.org/r/aef030c1-0257-98a9-4988-186efa48530c@gmail.com


Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
Reviewed-by: Vegard Nossum <vegard.nossum@oracle.com>
Cc: Willy Tarreau <w@1wt.eu>
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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent b0b91d18

fs/pipe.c

+23 −22

Original line number	Diff line number	Diff line
		@@ -622,12 +622,13 @@ static bool too_many_pipe_buffers_hard(struct user_struct *user)
		struct pipe_inode_info *alloc_pipe_info(void)
		{
		struct pipe_inode_info *pipe;

		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();

		pipe = kzalloc(sizeof(struct pipe_inode_info), GFP_KERNEL_ACCOUNT);
		if (pipe == NULL)
		goto out_free_uid;

		if (!too_many_pipe_buffers_hard(user)) {
		if (too_many_pipe_buffers_soft(user))
		pipe_bufs = 1;
		@@ -645,10 +646,10 @@ struct pipe_inode_info *alloc_pipe_info(void)
		mutex_init(&pipe->mutex);
		return pipe;
		}
		free_uid(user);
		kfree(pipe);
		}

		kfree(pipe);
		out_free_uid:
		free_uid(user);
		return NULL;
		}

Admin message