Commit 8da4b8c4 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Torvalds

lib/uuid.c: move generate_random_uuid() to uuid.c

Let's gather the UUID related functions under one hood.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarMatt Fleming <matt@codeblueprint.co.uk>
Cc: Dmitry Kasatkin <dmitry.kasatkin@gmail.com>
Cc: Mimi Zohar <zohar@linux.vnet.ibm.com>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b8b57278
...@@ -260,6 +260,7 @@ ...@@ -260,6 +260,7 @@
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/syscalls.h> #include <linux/syscalls.h>
#include <linux/completion.h> #include <linux/completion.h>
#include <linux/uuid.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
...@@ -1621,26 +1622,6 @@ SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count, ...@@ -1621,26 +1622,6 @@ SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count,
return urandom_read(NULL, buf, count, NULL); return urandom_read(NULL, buf, count, NULL);
} }
/***************************************************************
* Random UUID interface
*
* Used here for a Boot ID, but can be useful for other kernel
* drivers.
***************************************************************/
/*
* Generate random UUID
*/
void generate_random_uuid(unsigned char uuid_out[16])
{
get_random_bytes(uuid_out, 16);
/* Set UUID version to 4 --- truly random generation */
uuid_out[6] = (uuid_out[6] & 0x0F) | 0x40;
/* Set the UUID variant to DCE */
uuid_out[8] = (uuid_out[8] & 0x3F) | 0x80;
}
EXPORT_SYMBOL(generate_random_uuid);
/******************************************************************** /********************************************************************
* *
* Sysctl interface * Sysctl interface
......
...@@ -20,13 +20,13 @@ ...@@ -20,13 +20,13 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <linux/random.h>
#include <linux/iocontext.h> #include <linux/iocontext.h>
#include <linux/capability.h> #include <linux/capability.h>
#include <linux/ratelimit.h> #include <linux/ratelimit.h>
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/raid/pq.h> #include <linux/raid/pq.h>
#include <linux/semaphore.h> #include <linux/semaphore.h>
#include <linux/uuid.h>
#include <asm/div64.h> #include <asm/div64.h>
#include "ctree.h" #include "ctree.h"
#include "extent_map.h" #include "extent_map.h"
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
#include <linux/compat.h> #include <linux/compat.h>
#include <linux/mount.h> #include <linux/mount.h>
#include <linux/file.h> #include <linux/file.h>
#include <linux/random.h>
#include <linux/quotaops.h> #include <linux/quotaops.h>
#include <linux/uuid.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include "ext4_jbd2.h" #include "ext4_jbd2.h"
#include "ext4.h" #include "ext4.h"
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/mount.h> #include <linux/mount.h>
#include <linux/pagevec.h> #include <linux/pagevec.h>
#include <linux/random.h> #include <linux/uuid.h>
#include "f2fs.h" #include "f2fs.h"
#include "node.h" #include "node.h"
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
*/ */
#include <linux/string.h> #include <linux/string.h>
#include <linux/random.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/uuid.h>
#include "reiserfs.h" #include "reiserfs.h"
/* find where objectid map starts */ /* find where objectid map starts */
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
#include "ubifs.h" #include "ubifs.h"
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/random.h>
#include <linux/math64.h> #include <linux/math64.h>
#include <linux/uuid.h>
/* /*
* Default journal size in logical eraseblocks as a percent of total * Default journal size in logical eraseblocks as a percent of total
......
...@@ -26,7 +26,6 @@ extern void get_random_bytes(void *buf, int nbytes); ...@@ -26,7 +26,6 @@ extern void get_random_bytes(void *buf, int nbytes);
extern int add_random_ready_callback(struct random_ready_callback *rdy); extern int add_random_ready_callback(struct random_ready_callback *rdy);
extern void del_random_ready_callback(struct random_ready_callback *rdy); extern void del_random_ready_callback(struct random_ready_callback *rdy);
extern void get_random_bytes_arch(void *buf, int nbytes); extern void get_random_bytes_arch(void *buf, int nbytes);
void generate_random_uuid(unsigned char uuid_out[16]);
extern int random_int_secret_init(void); extern int random_int_secret_init(void);
#ifndef MODULE #ifndef MODULE
......
...@@ -33,6 +33,8 @@ static inline int uuid_be_cmp(const uuid_be u1, const uuid_be u2) ...@@ -33,6 +33,8 @@ static inline int uuid_be_cmp(const uuid_be u1, const uuid_be u2)
return memcmp(&u1, &u2, sizeof(uuid_be)); return memcmp(&u1, &u2, sizeof(uuid_be));
} }
void generate_random_uuid(unsigned char uuid[16]);
extern void uuid_le_gen(uuid_le *u); extern void uuid_le_gen(uuid_le *u);
extern void uuid_be_gen(uuid_be *u); extern void uuid_be_gen(uuid_be *u);
......
...@@ -23,6 +23,26 @@ ...@@ -23,6 +23,26 @@
#include <linux/uuid.h> #include <linux/uuid.h>
#include <linux/random.h> #include <linux/random.h>
/***************************************************************
* Random UUID interface
*
* Used here for a Boot ID, but can be useful for other kernel
* drivers.
***************************************************************/
/*
* Generate random UUID
*/
void generate_random_uuid(unsigned char uuid[16])
{
get_random_bytes(uuid, 16);
/* Set UUID version to 4 --- truly random generation */
uuid[6] = (uuid[6] & 0x0F) | 0x40;
/* Set the UUID variant to DCE */
uuid[8] = (uuid[8] & 0x3F) | 0x80;
}
EXPORT_SYMBOL(generate_random_uuid);
static void __uuid_gen_common(__u8 b[16]) static void __uuid_gen_common(__u8 b[16])
{ {
prandom_bytes(b, 16); prandom_bytes(b, 16);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment