diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-06-13 11:45:14 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2017-06-13 11:45:14 +0200 |
| commit | fdd050b5b3c96813ae6756ed68157d32ba31b9f2 (patch) | |
| tree | ca1a216730e32471cd17886d9de1902228bc340c /kernel | |
| parent | f06345add95f388519e83ec398134853e0f64ac9 (diff) | |
| parent | 87085ff2e90ecfa91f8bb0cb0ce19ea661bd6f83 (diff) | |
| download | linux-stable-fdd050b5b3c96813ae6756ed68157d32ba31b9f2.tar.gz linux-stable-fdd050b5b3c96813ae6756ed68157d32ba31b9f2.tar.bz2 linux-stable-fdd050b5b3c96813ae6756ed68157d32ba31b9f2.zip | |
Merge branch 'uuid-types' of bombadil.infradead.org:public_git/uuid into nvme-base
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sysctl_binary.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c index ece4b177052b..939a158eab11 100644 --- a/kernel/sysctl_binary.c +++ b/kernel/sysctl_binary.c @@ -1119,7 +1119,7 @@ static ssize_t bin_uuid(struct file *file, /* Only supports reads */ if (oldval && oldlen) { char buf[UUID_STRING_LEN + 1]; - uuid_be uuid; + uuid_t uuid; result = kernel_read(file, 0, buf, sizeof(buf) - 1); if (result < 0) @@ -1128,7 +1128,7 @@ static ssize_t bin_uuid(struct file *file, buf[result] = '\0'; result = -EIO; - if (uuid_be_to_bin(buf, &uuid)) + if (uuid_parse(buf, &uuid)) goto out; if (oldlen > 16) |