jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-02-01 05:57:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

STABLE14-inline-bug-for-linux-20060831

Browse Source 
FIXES 38854

inline bug so we get sane oopses


(cherry picked from commit d86f0c44d3c5910a6b54895484dc0286eac9bc73)
This commit is contained in:
Chas Williams 2006-08-31 05:54:52 +00:00 committed by Derrick Brashear
parent 85874d4da5
commit 8f1470a5cf
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/afs/afs_osi.h
View File

@ -220,7 +220,7 @@ typedef struct timeval osi_timeval_t;
#ifdef AFS_GLOBAL_SUNLOCK #ifdef AFS_GLOBAL_SUNLOCK
#define AFS_ASSERT_GLOCK() \ #define AFS_ASSERT_GLOCK() \
(ISAFS_GLOCK() || (osi_Panic("afs global lock not held at %s:%d\n", __FILE__, __LINE__), 0)) do { if (!ISAFS_GLOCK()) osi_Panic("afs global lock not held at %s:%d\n", __FILE__, __LINE__); } while (0)
#endif /* AFS_GLOBAL_SUNLOCK */ #endif /* AFS_GLOBAL_SUNLOCK */
#ifdef RX_ENABLE_LOCKS #ifdef RX_ENABLE_LOCKS

10
src/rx/rx_kcommon.c
View File

@ -124,6 +124,7 @@ rxi_GetUDPSocket(u_short port)
return rxi_GetHostUDPSocket(htonl(INADDR_ANY), port); return rxi_GetHostUDPSocket(htonl(INADDR_ANY), port);
} }
#if !defined(AFS_LINUX26_ENV)
void void
osi_Panic(msg, a1, a2, a3) osi_Panic(msg, a1, a2, a3)
char *msg; char *msg;
@ -132,7 +133,7 @@ osi_Panic(msg, a1, a2, a3)
msg = "Unknown AFS panic"; msg = "Unknown AFS panic";
printf(msg, a1, a2, a3); printf(msg, a1, a2, a3);
#ifdef AFS_LINUX24_ENV #ifdef AFS_LINUX20_ENV
* ((char *) 0) = 0; * ((char *) 0) = 0;
#else #else
panic(msg); panic(msg);
@ -261,6 +262,13 @@ osi_AssertFailK(const char *expr, const char *file, int line)
osi_Panic(buf); osi_Panic(buf);
} }
#else
void
osi_AssertFailK(const char *expr, const char *file, int line)
{
printk(KERN_CRIT "assertion failed: %s, file: %s, line: %d\n", expr, file, line);
}
#endif
#ifndef UKERNEL #ifndef UKERNEL
/* This is the server process request loop. Kernel server /* This is the server process request loop. Kernel server

10
src/rx/rx_prototypes.h
View File

@ -334,7 +334,14 @@ extern int rxk_DelPort(u_short aport);
extern void rxk_shutdownPorts(void); extern void rxk_shutdownPorts(void);
extern osi_socket rxi_GetUDPSocket(u_short port); extern osi_socket rxi_GetUDPSocket(u_short port);
extern osi_socket rxi_GetHostUDPSocket(u_int host, u_short port); extern osi_socket rxi_GetHostUDPSocket(u_int host, u_short port);
extern void osi_Panic(); #if defined(KERNEL) && defined(AFS_LINUX26_ENV)
#define osi_Panic(msg...) do { printk(KERN_CRIT "openafs: " msg); BUG(); } while (0)
#undef osi_Assert
#define osi_Assert(expr) \
do { if (!(expr)) { osi_AssertFailK(#expr, __FILE__, __LINE__); BUG(); } } while (0)
#else
extern void osi_Panic(); /* leave without args till stdarg rewrite */
#endif
extern int osi_utoa(char *buf, size_t len, unsigned long val); extern int osi_utoa(char *buf, size_t len, unsigned long val);
extern void rxi_InitPeerParams(register struct rx_peer *pp); extern void rxi_InitPeerParams(register struct rx_peer *pp);
extern void shutdown_rxkernel(void); extern void shutdown_rxkernel(void);
@ -565,7 +572,6 @@ extern pthread_mutex_t rx_if_mutex;
extern osi_socket rxi_GetUDPSocket(u_short port); extern osi_socket rxi_GetUDPSocket(u_short port);
extern void osi_AssertFailU(const char *expr, const char *file, int line); extern void osi_AssertFailU(const char *expr, const char *file, int line);
extern int rx_getAllAddr(afs_int32 * buffer, int maxSize); extern int rx_getAllAddr(afs_int32 * buffer, int maxSize);
extern void osi_Panic(); /* leave without args till stdarg rewrite */
extern void rxi_InitPeerParams(struct rx_peer *pp); extern void rxi_InitPeerParams(struct rx_peer *pp);
#if defined(AFS_AIX32_ENV) && !defined(KERNEL) #if defined(AFS_AIX32_ENV) && !defined(KERNEL)