Index: src/kernel/linux-2.6/super.c =================================================================== RCS file: /projects/cvsroot/pvfs2/src/kernel/linux-2.6/super.c,v retrieving revision 1.102 diff -a -u -r1.102 super.c --- src/kernel/linux-2.6/super.c 10 Jun 2008 14:35:23 -0000 1.102 +++ src/kernel/linux-2.6/super.c 23 Jul 2008 18:14:20 -0000 @@ -7,6 +7,7 @@ #include "pvfs2-kernel.h" #include "pvfs2-bufmap.h" #include "pvfs2-internal.h" +#include "linux/version.h" /* list for storing pvfs2 specific superblocks in use */ LIST_HEAD(pvfs2_superblocks); @@ -320,6 +321,7 @@ #endif /* PVFS2_LINUX_KERNEL_2_4 */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) /* called when the VFS removes this inode from the inode cache */ static void pvfs2_put_inode( struct inode *inode) @@ -349,6 +351,7 @@ #endif } } +#endif #ifdef HAVE_STATFS_LITE_SUPER_OPERATIONS static int pvfs2_statfs_lite( @@ -852,14 +855,18 @@ clear_inode: pvfs2_clear_inode, put_inode: pvfs2_put_inode, #else +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) .drop_inode = generic_delete_inode, +#endif .alloc_inode = pvfs2_alloc_inode, .destroy_inode = pvfs2_destroy_inode, #ifdef HAVE_READ_INODE .read_inode = pvfs2_read_inode, #endif .dirty_inode = pvfs2_dirty_inode, +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) .put_inode = pvfs2_put_inode, +#endif .statfs = pvfs2_statfs, .remount_fs = pvfs2_remount, #ifdef HAVE_FIND_INODE_HANDLE_SUPER_OPERATIONS