From 72f6a93d1bfdab2a325914e4c95a379d02090970 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Thu, 29 Jan 2004 11:29:18 +0000 Subject: fix --- kernel/dev.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'kernel/dev.c') diff --git a/kernel/dev.c b/kernel/dev.c index 9851327..daa464e 100644 --- a/kernel/dev.c +++ b/kernel/dev.c @@ -410,21 +410,31 @@ static inline int copy_out_header(struct fuse_out_header *oh, const char *buf, return 0; } +#ifdef KERNEL_2_6 static int fuse_invalidate(struct fuse_conn *fc, struct fuse_user_header *uh) { - struct inode *inode = iget(fc->sb, uh->ino); + struct inode *inode = ilookup(fc->sb, uh->ino); if (!inode) return -ENOENT; - -#ifdef KERNEL_2_6 invalidate_inode_pages(inode->i_mapping); -#else - invalidate_inode_pages(inode); -#endif - iput(inode); return 0; } +#else +static int fuse_invalidate(struct fuse_conn *fc, struct fuse_user_header *uh) +{ + struct inode *inode = iget(fc->sb, uh->ino); + int err = -ENOENT; + if(inode) { + if(inode->u.generic_ip) { + invalidate_inode_pages(inode); + err = 0; + } + iput(inode); + } + return err; +} +#endif static int fuse_user_request(struct fuse_conn *fc, const char *buf, size_t nbytes) -- cgit v1.2.3