lkml.org 
[lkml]   [2016]   [Feb]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v1 07/10] sysctl: drop away useless label
    Date
    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 7e7746a..509abe4 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.7.0
    \
     
     \ /
      Last update: 2016-02-17 13:41    [W:2.806 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site