JFS compilation fix [was Re: Linux 2.6.7]

Tomas Szepe
2004-06-16T08:07:32Z

On Jun-15 2004, Tue, 22:56 -0700
Linus Torvalds <torvalds@osdl.org> wrote:

> Summary of changes from v2.6.7-rc3 to v2.6.7
[snip]

Here's a trivial patch to fix JFS compilation in 2.6.7. The error
only happens in specific configs -- one such config can be found here:
http://www.pinerecords.com/kala/_nonpub/.config.louise26

I don't have the time to narrow the problem down to the config
entry that gets jfs_dtree.c to include jfs_dtree.h (jfs_dtree.c
itself doesn't have any relevat ifdefs).

--
Tomas Szepe <szepe@pinerecords.com>

diff -urN a/fs/jfs/jfs_dtree.c b/fs/jfs/jfs_dtree.c
--- a/fs/jfs/jfs_dtree.c 2004-06-16 09:29:58.000000000 +0200
+++ b/fs/jfs/jfs_dtree.c 2004-06-16 09:56:23.000000000 +0200
@@ -108,6 +108,7 @@
#include "jfs_dmap.h"
#include "jfs_unicode.h"
#include "jfs_debug.h"
+#include "jfs_dtree.h"

/* dtree split parameter */
struct dtsplit {
@@ -374,6 +375,8 @@
return index;
}
if (index == (MAX_INLINE_DIRTABLE_ENTRY + 1)) {
+ struct dir_table_slot temp_table[12];
+
/*
* It's time to move the inline table to an external
* page and begin to build the xtree
@@ -385,7 +388,6 @@
* Save the table, we're going to overwrite it with the
* xtree root
*/
- struct dir_table_slot temp_table[12];
memcpy(temp_table, &jfs_ip->i_dirtable, sizeof(temp_table));

/*