From: Davidlohr Bueso <davidlohr@hp.com>
To: akpm@linux-foundation.org, manfred@colorfullife.com
Cc: riel@redhat.com, aswin@hp.com, davidlohr@hp.com,
linux-kernel@vger.kernel.org
Subject: [PATCH 4/7] ipc: simplify sysvipc_proc_open return
Date: Fri, 10 Jan 2014 10:48:24 -0800 [thread overview]
Message-ID: <1389379707-20298-5-git-send-email-davidlohr@hp.com> (raw)
In-Reply-To: <1389379707-20298-1-git-send-email-davidlohr@hp.com>
Get rid of silly/useless label jumping.
Signed-off-by: Davidlohr Bueso <davidlohr@hp.com>
---
ipc/util.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/ipc/util.c b/ipc/util.c
index 7afe7de..cecb46e 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -911,8 +911,10 @@ static int sysvipc_proc_open(struct inode *inode, struct file *file)
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 inode *inode, struct file *file)
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)
--
1.8.1.4
next prev parent reply other threads:[~2014-01-10 18:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-10 18:48 [PATCH -next 0/7] ipc: some misc updates & optimizations Davidlohr Bueso
2014-01-10 18:48 ` [PATCH 1/7] ipc: standardize code comments Davidlohr Bueso
2014-01-10 18:48 ` [PATCH 2/7] ipc: remove braces for single statements Davidlohr Bueso
2014-01-10 18:48 ` [PATCH 3/7] ipc: remove useless return statement Davidlohr Bueso
2014-01-10 18:48 ` Davidlohr Bueso [this message]
2014-01-10 18:48 ` [PATCH 5/7] ipc: delete seq_max field in struct ipc_ids Davidlohr Bueso
2014-01-10 18:48 ` [PATCH 6/7] ipc: share ids rwsem when possible in ipcget_public Davidlohr Bueso
2014-01-10 18:48 ` [PATCH 7/7] ipc,msg: document barriers Davidlohr Bueso
2014-01-11 4:18 ` Mike Galbraith
2014-01-11 9:02 ` [PATCH -next 0/7] ipc: some misc updates & optimizations Manfred Spraul
2014-01-11 17:54 ` Davidlohr Bueso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1389379707-20298-5-git-send-email-davidlohr@hp.com \
--to=davidlohr@hp.com \
--cc=akpm@linux-foundation.org \
--cc=aswin@hp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=manfred@colorfullife.com \
--cc=riel@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®