New upstream version 0.7.2

[mirror_spl-debian.git] / include / sys / random.h

diff --git a/include/sys/random.h b/include/sys/random.h
index 2e206ccae37ba8d1e5fff82bf987c1af1820b00f..64f70ee52f4a000d5543b6438267d64724c55af5 100644 (file)
--- a/include/sys/random.h
+++ b/include/sys/random.h
@@ -1,45 +1,33 @@
-/*
- *  This file is part of the SPL: Solaris Porting Layer.
- *
- *  Copyright (c) 2008 Lawrence Livermore National Security, LLC.
- *  Produced at Lawrence Livermore National Laboratory
- *  Written by:
- *          Brian Behlendorf <behlendorf1@llnl.gov>,
- *          Herb Wartens <wartens2@llnl.gov>,
- *          Jim Garlick <garlick@llnl.gov>
+/*****************************************************************************\
+ *  Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC.
+ *  Copyright (C) 2007 The Regents of the University of California.
+ *  Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+ *  Written by Brian Behlendorf <behlendorf1@llnl.gov>.
  *  UCRL-CODE-235197
  *
- *  This is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  This file is part of the SPL, Solaris Porting Layer.
+ *  For details, see <http://zfsonlinux.org/>.
+ *
+ *  The SPL is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the
+ *  Free Software Foundation; either version 2 of the License, or (at your
+ *  option) any later version.
  *
- *  This is distributed in the hope that it will be useful, but WITHOUT
+ *  The SPL is distributed in the hope that it will be useful, but WITHOUT
  *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  *  for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
- */
+ *  with the SPL.  If not, see <http://www.gnu.org/licenses/>.
+\*****************************************************************************/
 
 #ifndef _SPL_RANDOM_H
 #define        _SPL_RANDOM_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <linux/module.h>
 #include <linux/random.h>
 
-/* FIXME:
- * Should add support for blocking in the future to
- * ensure that proper entopy is collected.  ZFS doesn't
- * use it at the moment so this is good enough for now.
- * Always will succeed by returning 0.
- */
 static __inline__ int
 random_get_bytes(uint8_t *ptr, size_t len)
 {
@@ -47,16 +35,6 @@ random_get_bytes(uint8_t *ptr, size_t len)
        return 0;
 }
 
- /* Always will succeed by returning 0. */
-static __inline__ int
-random_get_pseudo_bytes(uint8_t *ptr, size_t len)
-{
-       get_random_bytes((void *)ptr,(int)len);
-       return 0;
-}
-
-#ifdef __cplusplus
-}
-#endif
+extern int random_get_pseudo_bytes(uint8_t *ptr, size_t len);
 
 #endif /* _SPL_RANDOM_H */