Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/char/random.c

+1 −20
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@ 
#include <linux/irq.h>

#include <linux/syscalls.h>

#include <linux/completion.h>

#include <linux/uuid.h>



#include <asm/processor.h>

#include <asm/uaccess.h>
@@ -1621,26 +1622,6 @@ SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count, 
	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

fs/btrfs/volumes.c

+1 −1
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ 
#include <linux/slab.h>

#include <linux/buffer_head.h>

#include <linux/blkdev.h>

#include <linux/random.h>

#include <linux/iocontext.h>

#include <linux/capability.h>

#include <linux/ratelimit.h>

#include <linux/kthread.h>

#include <linux/raid/pq.h>

#include <linux/semaphore.h>

#include <linux/uuid.h>

#include <asm/div64.h>

#include "ctree.h"

#include "extent_map.h"

fs/ext4/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ 
#include <linux/compat.h>

#include <linux/mount.h>

#include <linux/file.h>

#include <linux/random.h>

#include <linux/quotaops.h>

#include <linux/uuid.h>

#include <asm/uaccess.h>

#include "ext4_jbd2.h"

#include "ext4.h"

fs/f2fs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <linux/uaccess.h>

#include <linux/mount.h>

#include <linux/pagevec.h>

#include <linux/random.h>

#include <linux/uuid.h>



#include "f2fs.h"

#include "node.h"

fs/reiserfs/objectid.c

+1 −1
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ 
 */



#include <linux/string.h>

#include <linux/random.h>

#include <linux/time.h>

#include <linux/uuid.h>

#include "reiserfs.h"



/* find where objectid map starts */