Subject: [merged] ipc-simplify-sysvipc_proc_open-return.patch removed from -mm tree To: davidlohr@xxxxxx,aswin@xxxxxx,manfred@xxxxxxxxxxxxxxxx,riel@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Tue, 28 Jan 2014 11:09:37 -0800 The patch titled Subject: ipc: simplify sysvipc_proc_open() return has been removed from the -mm tree. Its filename was ipc-simplify-sysvipc_proc_open-return.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Davidlohr Bueso <davidlohr@xxxxxx> Subject: ipc: simplify sysvipc_proc_open() return Get rid of silly/useless label jumping. Signed-off-by: Davidlohr Bueso <davidlohr@xxxxxx> Cc: Aswin Chandramouleeswaran <aswin@xxxxxx> Cc: Rik van Riel <riel@xxxxxxxxxx> Acked-by: Manfred Spraul <manfred@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- ipc/util.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff -puN ipc/util.c~ipc-simplify-sysvipc_proc_open-return ipc/util.c --- a/ipc/util.c~ipc-simplify-sysvipc_proc_open-return +++ a/ipc/util.c @@ -911,8 +911,10 @@ static int sysvipc_proc_open(struct inod goto out; ret = seq_open(file, &sysvipc_proc_seqops); - if (ret) - goto out_kfree; + if (ret) { + kfree(iter); + goto out; + } seq = file->private_data; seq->private = iter; @@ -921,9 +923,6 @@ static int sysvipc_proc_open(struct inod iter->ns = get_ipc_ns(current->nsproxy->ipc_ns); out: return ret; -out_kfree: - kfree(iter); - goto out; } static int sysvipc_proc_release(struct inode *inode, struct file *file) _ Patches currently in -mm which might be from davidlohr@xxxxxx are origin.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html