diff options
| author | Jens Axboe <axboe@fb.com> | 2017-06-16 10:14:59 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-06-16 10:14:59 -0600 |
| commit | c27b2d634f81d1472a8107fc857481b67555d9bd (patch) | |
| tree | 3c35ede17e6f13f70a92529f097f2d2412308782 /kernel/sysctl_binary.c | |
| parent | cc3f2e9fbf905427b48e112288fbd8f0dbd3252d (diff) | |
| parent | 6b8190d61a622e095f04451437953acd2d74b371 (diff) | |
| download | linux-c27b2d634f81d1472a8107fc857481b67555d9bd.tar.gz linux-c27b2d634f81d1472a8107fc857481b67555d9bd.tar.bz2 linux-c27b2d634f81d1472a8107fc857481b67555d9bd.zip | |
Merge branch 'nvme-4.13' of git://git.infradead.org/nvme into for-4.13/block
Pull NVMe changes for 4.13 from Christoph:
Highlights:
- UUID identifier support from Johannes
- Lots of cleanups from Sagi
- Host Memory Buffer support from me
And lots of cleanups and smaller fixes of course.
Note that the UUID identifier changes are based on top of the uuid tree.
I am the maintainer of that tree and will send it to Linus as soon as
4.12 is released as various other trees depend on it as well (and the
diffstat includes those changes unfortunately)
Diffstat (limited to 'kernel/sysctl_binary.c')
| -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) |