diff options
| author | Joe Perches <joe@perches.com> | 2007-05-08 13:49:03 +1000 |
|---|---|---|
| committer | Tim Shimmin <tes@sgi.com> | 2007-05-08 13:49:03 +1000 |
| commit | e7a23a9b37c395a153a541d4c50e166eef6abe49 (patch) | |
| tree | 11afa34a0a6d10c482f6b07f1d6d6788bd71ba11 | |
| parent | e9ed9d2240c71014a84043095af4465ffce61367 (diff) | |
| download | kernel_samsung_smdk4412-e7a23a9b37c395a153a541d4c50e166eef6abe49.zip kernel_samsung_smdk4412-e7a23a9b37c395a153a541d4c50e166eef6abe49.tar.gz kernel_samsung_smdk4412-e7a23a9b37c395a153a541d4c50e166eef6abe49.tar.bz2 | |
[XFS] reducing the number of random number functions.
Patch provided by Joe Perches
SGI-PV: 961696
SGI-Modid: xfs-linux-melb:xfs-kern:28209a
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>
| -rw-r--r-- | fs/xfs/support/debug.c | 17 | ||||
| -rw-r--r-- | fs/xfs/support/debug.h | 2 | ||||
| -rw-r--r-- | fs/xfs/xfs_alloc.c | 2 | ||||
| -rw-r--r-- | fs/xfs/xfs_error.c | 2 |
4 files changed, 3 insertions, 20 deletions
diff --git a/fs/xfs/support/debug.c b/fs/xfs/support/debug.c index 08bbd3c..f45a49f 100644 --- a/fs/xfs/support/debug.c +++ b/fs/xfs/support/debug.c @@ -81,20 +81,3 @@ assfail(char *expr, char *file, int line) printk("Assertion failed: %s, file: %s, line: %d\n", expr, file, line); BUG(); } - -#if ((defined(DEBUG) || defined(INDUCE_IO_ERRROR)) && !defined(NO_WANT_RANDOM)) -unsigned long random(void) -{ - static unsigned long RandomValue = 1; - /* cycles pseudo-randomly through all values between 1 and 2^31 - 2 */ - register long rv = RandomValue; - register long lo; - register long hi; - - hi = rv / 127773; - lo = rv % 127773; - rv = 16807 * lo - 2836 * hi; - if (rv <= 0) rv += 2147483647; - return RandomValue = rv; -} -#endif /* DEBUG || INDUCE_IO_ERRROR || !NO_WANT_RANDOM */ diff --git a/fs/xfs/support/debug.h b/fs/xfs/support/debug.h index 2a70cc6..a27a7c8 100644 --- a/fs/xfs/support/debug.h +++ b/fs/xfs/support/debug.h @@ -50,7 +50,7 @@ extern void assfail(char *expr, char *f, int l); #else /* DEBUG */ # define ASSERT(expr) ASSERT_ALWAYS(expr) -extern unsigned long random(void); +# include <linux/random.h> #ifndef STATIC # define STATIC noinline diff --git a/fs/xfs/xfs_alloc.c b/fs/xfs/xfs_alloc.c index e80dda3..8e9a40a 100644 --- a/fs/xfs/xfs_alloc.c +++ b/fs/xfs/xfs_alloc.c @@ -764,7 +764,7 @@ xfs_alloc_ag_vextent_near( */ int dofirst; /* set to do first algorithm */ - dofirst = random() & 1; + dofirst = random32() & 1; #endif /* * Get a cursor for the by-size btree. diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c index b1af544..8c43316 100644 --- a/fs/xfs/xfs_error.c +++ b/fs/xfs/xfs_error.c @@ -80,7 +80,7 @@ xfs_error_test(int error_tag, int *fsidp, char *expression, int i; int64_t fsid; - if (random() % randfactor) + if (random32() % randfactor) return 0; memcpy(&fsid, fsidp, sizeof(xfs_fsid_t)); |