mcst-linux-kernel/patches-2024.06.26/jfsutils-1.1.13/0002-Bug151691-Avoid-multip...

65 lines
2.0 KiB
Diff

--- old/fscklog/display.c 2005-11-22 20:43:54.000000000 +0000
+++ new/fscklog/display.c 2023-08-31 14:21:46.591267729 +0000
@@ -54,7 +54,7 @@
* output: fsck extracted service log I/O buffer
*
*/
-char xchklog_buffer[XCHKLOG_BUFSIZE];
+extern char xchklog_buffer[XCHKLOG_BUFSIZE];
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
*
--- old/libfs/log_dump.c 2006-06-05 19:31:41.000000000 +0000
+++ new/libfs/log_dump.c 2023-08-31 14:30:46.631255220 +0000
@@ -69,9 +69,9 @@
* things for the log.
*/
int32_t logend; /* address of the end of last log record */
-struct logsuper logsup; /* log super block */
-int32_t numdoblk; /* number of do blocks used */
-int32_t numnodofile; /* number of nodo file blocks used */
+extern struct logsuper logsup; /* log super block */
+extern int32_t numdoblk; /* number of do blocks used */
+extern int32_t numnodofile; /* number of nodo file blocks used */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
*
@@ -124,7 +124,7 @@
*/
/* buffer header table */
-struct bufhdr {
+extern struct bufhdr {
int16_t next; /* 2: next on free/lru list */
int16_t prev; /* 2: previous on free/lru list */
int16_t hnext; /* 2: next on hash chain */
@@ -139,22 +139,22 @@
/* buffer table */
struct bufpool {
char bytes[PSIZE];
-} buffer[NBUFPOOL - 1];
+} extern buffer[NBUFPOOL - 1];
/*
* log page buffer cache
*
* log has its own 4 page buffer pool.
*/
-uint8_t afterdata[LOGPSIZE * 2]; /* buffer to read in redopage data */
+extern uint8_t afterdata[LOGPSIZE * 2]; /* buffer to read in redopage data */
/*
* Miscellaneous
*/
-caddr_t prog; /* Program name */
-int32_t mntcnt, bufsize;
-char *mntinfo;
-int32_t retcode; /* return code from logredo */
+extern caddr_t prog; /* Program name */
+extern int32_t mntcnt, bufsize;
+extern char *mntinfo;
+extern int32_t retcode; /* return code from logredo */
/*
* external references