This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
gfs2-utils: master - libgfs2: Remove RANDOM/SRANDOM macros
- From: Steven Whitehouse <swhiteho at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Mon, 26 Jan 2009 10:10:39 +0000 (UTC)
- Subject: gfs2-utils: master - libgfs2: Remove RANDOM/SRANDOM macros
Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdiff;h=f33671260cfb3c6e4623cc1383a48a0447fa4515
Commit: f33671260cfb3c6e4623cc1383a48a0447fa4515
Parent: d2fe181c3b0e959d3ec0d5514b47836d5dd37d1f
Author: Steven Whitehouse <swhiteho@redhat.com>
AuthorDate: Mon Jan 26 08:03:35 2009 +0000
Committer: Steven Whitehouse <swhiteho@redhat.com>
CommitterDate: Mon Jan 26 08:03:35 2009 +0000
libgfs2: Remove RANDOM/SRANDOM macros
They are only used in a couple of places, so I've moved them to
where they are actually called.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
---
gfs2/libgfs2/libgfs2.h | 3 ---
gfs2/libgfs2/structures.c | 2 +-
gfs2/mkfs/main.c | 2 +-
gfs2/mkfs/main_jadd.c | 1 +
4 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h
index a7bf46a..c67924a 100644
--- a/gfs2/libgfs2/libgfs2.h
+++ b/gfs2/libgfs2/libgfs2.h
@@ -71,9 +71,6 @@ static __inline__ uint64_t do_div_i(uint64_t *num, unsigned int den)
}
#define do_div(n, d) do_div_i(&(n), (d))
-#define SRANDOM do { srandom(time(NULL) ^ getpid()); } while (0)
-#define RANDOM(values) ((values) * (random() / (RAND_MAX + 1.0)))
-
struct device {
uint64_t start;
uint64_t length;
diff --git a/gfs2/libgfs2/structures.c b/gfs2/libgfs2/structures.c
index 6c9a8b2..05beeb9 100644
--- a/gfs2/libgfs2/structures.c
+++ b/gfs2/libgfs2/structures.c
@@ -83,7 +83,7 @@ void write_journal(struct gfs2_sbd *sdp, struct gfs2_inode *ip, unsigned int j,
{
struct gfs2_log_header lh;
unsigned int x;
- uint64_t seq = RANDOM(blocks);
+ uint64_t seq = ((blocks) * (random() / (RAND_MAX + 1.0)));
uint32_t hash;
unsigned int height;
diff --git a/gfs2/mkfs/main.c b/gfs2/mkfs/main.c
index 076ed16..2707262 100644
--- a/gfs2/mkfs/main.c
+++ b/gfs2/mkfs/main.c
@@ -31,7 +31,7 @@ main(int argc, char *argv[])
char *p, *whoami;
prog_name = argv[0];
- SRANDOM;
+ srandom(time(NULL) ^ getpid());
p = strdup(prog_name);
whoami = basename(p);
diff --git a/gfs2/mkfs/main_jadd.c b/gfs2/mkfs/main_jadd.c
index 3197fe5..2975d7e 100644
--- a/gfs2/mkfs/main_jadd.c
+++ b/gfs2/mkfs/main_jadd.c
@@ -21,6 +21,7 @@
#include "gfs2_mkfs.h"
#define BUF_SIZE 4096
+#define RANDOM(values) ((values) * (random() / (RAND_MAX + 1.0)))
void
make_jdata(int fd, char *value)