diff options
| author | Miklos Szeredi <miklos@szeredi.hu> | 2005-11-29 11:29:44 +0000 |
|---|---|---|
| committer | Miklos Szeredi <miklos@szeredi.hu> | 2005-11-29 11:29:44 +0000 |
| commit | bb4b97418d17f0b2ba77c888accf547685832fda (patch) | |
| tree | 82a95decb69b735ffc7ebaf2df16f4066edc7ea7 | |
| parent | 3cc8a26670352f3a233cd0e7720f2798410e5125 (diff) | |
| download | libfuse-bb4b97418d17f0b2ba77c888accf547685832fda.tar.gz | |
compile fixes
| -rw-r--r-- | kernel/dir.c | 4 | ||||
| -rw-r--r-- | kernel/file.c | 6 | ||||
| -rw-r--r-- | kernel/inode.c | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/kernel/dir.c b/kernel/dir.c index 7e92f67..b2fbca2 100644 --- a/kernel/dir.c +++ b/kernel/dir.c @@ -1208,7 +1208,11 @@ static int fuse_removexattr(struct dentry *entry, const char *name) #endif static struct inode_operations fuse_dir_inode_operations = { +#ifdef KERNEL_2_6 .lookup = fuse_lookup, +#else + .lookup = fuse_lookup_2_4, +#endif .mkdir = fuse_mkdir, .symlink = fuse_symlink, .unlink = fuse_unlink, diff --git a/kernel/file.c b/kernel/file.c index 8187b10..a4cc04d 100644 --- a/kernel/file.c +++ b/kernel/file.c @@ -16,6 +16,12 @@ #define PageUptodate(page) Page_Uptodate(page) #define clear_page_dirty(page) ClearPageDirty(page) #endif +#ifndef KERNEL_2_6_11_PLUS +static inline loff_t page_offset(struct page *page) +{ + return ((loff_t)page->index) << PAGE_CACHE_SHIFT; +} +#endif static struct file_operations fuse_direct_io_file_operations; static int fuse_send_open(struct inode *inode, struct file *file, int isdir, diff --git a/kernel/inode.c b/kernel/inode.c index bb61b7d..1d56566 100644 --- a/kernel/inode.c +++ b/kernel/inode.c @@ -290,7 +290,9 @@ static void convert_fuse_statfs(struct kstatfs *stbuf, struct fuse_kstatfs *attr { stbuf->f_type = FUSE_SUPER_MAGIC; stbuf->f_bsize = attr->bsize; +#ifdef KERNEL_2_6 stbuf->f_frsize = attr->frsize; +#endif stbuf->f_blocks = attr->blocks; stbuf->f_bfree = attr->bfree; stbuf->f_bavail = attr->bavail; |