diff options
| author | Nathan Scott <nathans@sgi.com> | 2006-01-12 10:29:53 +1100 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2006-01-12 10:29:53 +1100 |
| commit | 3762ec6bf76cdd32653c409dbad09f7b85807c68 (patch) | |
| tree | ffe6dbe857d17709c352e0d60a5be8cba3b83400 /fs/xfs/support/debug.c | |
| parent | 6ab65429b4871c42bfd0013f7f5e49d40c0642cd (diff) | |
| download | op-kernel-dev-3762ec6bf76cdd32653c409dbad09f7b85807c68.zip op-kernel-dev-3762ec6bf76cdd32653c409dbad09f7b85807c68.tar.gz | |
[XFS] Merge in trivial changes, sync up headers with userspace
equivalents.
SGI-PV: 907752
SGI-Modid: xfs-linux-melb:xfs-kern:24961a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Diffstat (limited to 'fs/xfs/support/debug.c')
| -rw-r--r-- | fs/xfs/support/debug.c | 58 |
1 files changed, 24 insertions, 34 deletions
diff --git a/fs/xfs/support/debug.c b/fs/xfs/support/debug.c index e281c3a..b08b3d9 100644 --- a/fs/xfs/support/debug.c +++ b/fs/xfs/support/debug.c @@ -33,39 +33,6 @@ static const char * const err_level[XFS_MAX_ERR_LEVEL+1] = KERN_INFO, KERN_DEBUG}; void -assfail(char *a, char *f, int l) -{ - printk("XFS assertion failed: %s, file: %s, line: %d\n", a, f, l); - 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 ); -} - -int -get_thread_id(void) -{ - return current->pid; -} - -#endif /* DEBUG || INDUCE_IO_ERRROR || !NO_WANT_RANDOM */ - -void cmn_err(register int level, char *fmt, ...) { char *fp = fmt; @@ -90,7 +57,6 @@ cmn_err(register int level, char *fmt, ...) BUG(); } - void icmn_err(register int level, char *fmt, va_list ap) { @@ -109,3 +75,27 @@ icmn_err(register int level, char *fmt, va_list ap) if (level == CE_PANIC) BUG(); } + +void +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 */ |
