From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Arnd Bergmann <arnd@arndb.de>, "Theodore Ts'o" <tytso@mit.edu>,
Matt Fleming <matt@codeblueprint.co.uk>,
Andrew Morton <akpm@linux-foundation.org>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>,
linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org,
linux-api@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v2 5/8] sysctl: drop away useless label
Date: Mon, 4 Apr 2016 16:30:07 +0300 [thread overview]
Message-ID: <1459776610-68469-6-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1459776610-68469-1-git-send-email-andriy.shevchenko@linux.intel.com>
We have no locking in bin_uuid(). Thus, we may remove the out label and use
return statements directly.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
kernel/sysctl_binary.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
index 10a1d7d..055ad65 100644
--- a/kernel/sysctl_binary.c
+++ b/kernel/sysctl_binary.c
@@ -1123,15 +1123,14 @@ static ssize_t bin_uuid(struct file *file,
result = kernel_read(file, 0, buf, sizeof(buf) - 1);
if (result < 0)
- goto out;
+ return result;
buf[result] = '\0';
/* Convert the uuid to from a string to binary */
for (i = 0; i < 16; i++) {
- result = -EIO;
if (!isxdigit(str[0]) || !isxdigit(str[1]))
- goto out;
+ return -EIO;
uuid[i] = (hex_to_bin(str[0]) << 4) |
hex_to_bin(str[1]);
@@ -1143,15 +1142,12 @@ static ssize_t bin_uuid(struct file *file,
if (oldlen > 16)
oldlen = 16;
- result = -EFAULT;
if (copy_to_user(oldval, uuid, oldlen))
- goto out;
+ return -EFAULT;
copied = oldlen;
}
- result = copied;
-out:
- return result;
+ return copied;
}
static ssize_t bin_dn_node_address(struct file *file,
--
2.8.0.rc3
next prev parent reply other threads:[~2016-04-04 13:31 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-04 13:30 [PATCH v2 0/8] uuid: convert users to generic UUID API Andy Shevchenko
2016-04-04 13:30 ` [PATCH v2 1/8] lib/vsprintf: simplify UUID printing Andy Shevchenko
2016-04-04 13:30 ` [PATCH v2 2/8] lib/uuid: move generate_random_uuid() to uuid.c Andy Shevchenko
2016-04-04 13:30 ` [PATCH v2 3/8] lib/uuid: introduce few more generic helpers for UUID Andy Shevchenko
2016-04-04 23:40 ` Andrew Morton
2016-04-04 23:55 ` Joe Perches
2016-04-05 0:48 ` Stephen Rothwell
2016-04-05 10:51 ` Andy Shevchenko
2016-04-04 13:30 ` [PATCH v2 4/8] lib/uuid: remove FSF address Andy Shevchenko
2016-04-04 13:30 ` Andy Shevchenko [this message]
2016-04-04 13:30 ` [PATCH v2 6/8] sysctl: use generic UUID library Andy Shevchenko
2016-04-04 13:30 ` [PATCH v2 7/8] efi: redefine type, constant, macro from generic code Andy Shevchenko
2016-04-04 13:30 ` [PATCH v2 8/8] efivars: use generic UUID library Andy Shevchenko
2016-04-04 23:40 ` [PATCH v2 0/8] uuid: convert users to generic UUID API Andrew Morton
2016-04-05 11:07 ` Andy Shevchenko
2016-04-05 14:06 ` Matt Fleming
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=1459776610-68469-6-git-send-email-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=linux-api@vger.kernel.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=matt@codeblueprint.co.uk \
--cc=tytso@mit.edu \
/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