From: Chen Gang <gang.chen@asianux.com>
To: Ingo Molnar <mingo@kernel.org>,
"a.p.zijlstra@chello.nl" <a.p.zijlstra@chello.nl>,
Mel Gorman <mgorman@suse.de>,
riel@redhat.com
Cc: Andrew Morton <akpm@linux-foundation.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: [PATCH 2/2] kernel/sysctl.c: simplify code for C code readers
Date: Tue, 20 Aug 2013 11:39:30 +0800 [thread overview]
Message-ID: <5212E4F2.5010001@asianux.com> (raw)
In-Reply-To: <5212E4B2.5020708@asianux.com>
In related functions, they have already had tag 'free', so use 'goto'
instead of 'break' to keep one (not multiple) style in each function.
Also remove useless checking 'err' code or move it to related 'if' code
block.
Signed-off-by: Chen Gang <gang.chen@asianux.com>
---
kernel/sysctl.c | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index ee00986..c05e2cd 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1958,27 +1958,28 @@ static int __do_proc_dointvec(void *tbl_data, struct ctl_table *table,
proc_wspace_sep,
sizeof(proc_wspace_sep), NULL);
if (err)
- break;
+ goto free;
if (conv(&neg, &lval, i, 1, data)) {
err = -EINVAL;
- break;
+ goto free;
}
} else {
if (conv(&neg, &lval, i, 0, data)) {
err = -EINVAL;
- break;
+ goto free;
}
- if (!first)
+ if (!first) {
err = proc_put_char(&buffer, &left, '\t');
- if (err)
- break;
+ if (err)
+ goto free;
+ }
err = proc_put_long(&buffer, &left, lval, neg);
if (err)
- break;
+ goto free;
}
}
- if (!write && !first && left && !err)
+ if (!write && !first && left)
err = proc_put_char(&buffer, &left, '\n');
if (write && !err && left)
left -= proc_skip_spaces(&kbuf);
@@ -2206,7 +2207,7 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
proc_wspace_sep,
sizeof(proc_wspace_sep), NULL);
if (err)
- break;
+ goto free;
if (neg)
continue;
if ((min && val < *min) || (max && val > *max))
@@ -2221,11 +2222,11 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
}
err = proc_put_long(&buffer, &left, val, false);
if (err)
- break;
+ goto free;
}
}
- if (!write && !first && left && !err)
+ if (!write && !first && left)
err = proc_put_char(&buffer, &left, '\n');
if (write && !err)
left -= proc_skip_spaces(&kbuf);
@@ -2515,7 +2516,7 @@ int proc_do_large_bitmap(struct ctl_table *table, int write,
return -ENOMEM;
}
proc_skip_char(&kbuf, &left, '\n');
- while (!err && left) {
+ while (left) {
unsigned long val_a, val_b;
bool neg;
--
1.7.7.6
next prev parent reply other threads:[~2013-08-20 3:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-20 3:37 [PATCH 0/2] kernel/sysctl.c: about the return value after fail call Chen Gang
2013-08-20 3:38 ` [PATCH 1/2] kernel/sysctl.c: check return value after call proc_put_char() in __do_proc_doulongvec_minmax() Chen Gang
2013-08-20 3:39 ` Chen Gang [this message]
2013-08-20 5:09 ` Joe Perches
2013-08-20 5:17 ` Chen Gang
2013-09-03 5:16 ` [PATCH] " Chen Gang
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=5212E4F2.5010001@asianux.com \
--to=gang.chen@asianux.com \
--cc=a.p.zijlstra@chello.nl \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mgorman@suse.de \
--cc=mingo@kernel.org \
--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