The patch titled
Subject: sysctl: drop away useless label
has been removed from the -mm tree. Its filename was
sysctl-drop-away-useless-label.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
From: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Subject: sysctl: drop away useless label
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@xxxxxxxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Cc: "Theodore Ts'o" <tytso@xxxxxxx>
Cc: Matt Fleming <matt@xxxxxxxxxxxxxxxxxxx>
Cc: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/sysctl_binary.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff -puN kernel/sysctl_binary.c~sysctl-drop-away-useless-label kernel/sysctl_binary.c
--- a/kernel/sysctl_binary.c~sysctl-drop-away-useless-label
+++ a/kernel/sysctl_binary.c
@@ -1123,15 +1123,14 @@ static ssize_t bin_uuid(struct file *fil
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 *fil
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,
_
Patches currently in -mm which might be from andriy.shevchenko@xxxxxxxxxxxxxxx are
sysctl-use-generic-uuid-library.patch
efi-redefine-type-constant-macro-from-generic-code.patch
efivars-use-generic-uuid-library.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
