From 7a983959bfc005a53fa700fb41074bc90b04380c Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Fri, 28 Jan 2005 09:58:19 +0000 Subject: fix --- ChangeLog | 4 ++++ kernel/dir.c | 6 +++--- kernel/fuse_i.h | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e13c79f..5bd917c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-01-28 Miklos Szeredi + + * Fix compilation on 2.6.7 + 2005-01-26 Miklos Szeredi * Released 2.2-pre6 diff --git a/kernel/dir.c b/kernel/dir.c index f363a17..7903a66 100644 --- a/kernel/dir.c +++ b/kernel/dir.c @@ -16,7 +16,7 @@ #include #endif #include -#ifdef KERNEL_2_6_7_PLUS +#ifdef KERNEL_2_6_8_PLUS #include #endif @@ -599,7 +599,7 @@ static void free_link(char *link) free_page((unsigned long) link); } -#ifdef KERNEL_2_6_7_PLUS +#ifdef KERNEL_2_6_8_PLUS static int fuse_follow_link(struct dentry *dentry, struct nameidata *nd) { nd_set_link(nd, read_link(dentry)); @@ -1042,7 +1042,7 @@ static struct inode_operations fuse_common_inode_operations = { static struct inode_operations fuse_symlink_inode_operations = { .setattr = fuse_setattr, .follow_link = fuse_follow_link, -#ifdef KERNEL_2_6_7_PLUS +#ifdef KERNEL_2_6_8_PLUS .put_link = fuse_put_link, .readlink = generic_readlink, #else diff --git a/kernel/fuse_i.h b/kernel/fuse_i.h index e4d9588..4aa643b 100644 --- a/kernel/fuse_i.h +++ b/kernel/fuse_i.h @@ -21,8 +21,8 @@ # if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,6) # define KERNEL_2_6_6_PLUS # endif -# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,7) -# define KERNEL_2_6_7_PLUS +# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,8) +# define KERNEL_2_6_8_PLUS # endif # if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10) # define KERNEL_2_6_10_PLUS -- cgit v1.2.3