2006-09-26 17:54:20

by Judith Lebzelter

[permalink] [raw]
Subject: 2.6.18-mm1 inode_diet fix

Hi,

In OSDL's automated cross-compiles, I see an error for powerpc allmodconfig in 2.6.18-mm1:

arch/powerpc/platforms/pseries/hvCall_inst.c: In function 'hcall_inst_seq_open':
arch/powerpc/platforms/pseries/hvCall_inst.c:88: error: 'struct inode' has no member named 'u'
make[2]: [arch/powerpc/platforms/pseries/hvCall_inst.o] Error 1 (ignored)
powerpc64-unknown-linux-gnu-ld: arch/powerpc/platforms/pseries/hvCall_inst.o: No such file: No such file or directory
make[2]: [arch/powerpc/platforms/pseries/built-in.o] Error 1 (ignored)
powerpc64-unknown-linux-gnu-ld: arch/powerpc/platforms/pseries/built-in.o: No such file: No such file or directory
make[1]: [arch/powerpc/platforms/built-in.o] Error 1 (ignored)


This seems to be an oversight in patch:
inode_diet-replace-inodeugeneric_ip-with-inodei_private.patch

Here is a patch that removes the error.

Signed-off-by: Judith Lebzelter <[email protected]>


--- linux/arch/powerpc/platforms/pseries/hvCall_inst.c.orig 2006-09-26 09:52:19.701978352 -0700
+++ linux/arch/powerpc/platforms/pseries/hvCall_inst.c 2006-09-26 09:52:33.971809008 -0700
@@ -85,7 +85,7 @@

rc = seq_open(file, &hcall_inst_seq_ops);
seq = file->private_data;
- seq->private = file->f_dentry->d_inode->u.generic_ip;
+ seq->private = file->f_dentry->d_inode->i_private;

return rc;
}