[PATCH] Adapt to fuse in kernel 2.6.17
From: Robin Rosenberg <robin.rosenberg@dewire.com>
---
Makefile | 2 +-
api-fuse.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 8668a03..e80661f 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ GITCFLAGS = '-DSHA1_HEADER=<openssl/sha.
GITLDFLAGS = $(GITDIR)/libgit.a -lcrypto -lz
# What flags are required to build against FUSE
-FUSECFLAGS = '-DFUSE_HEADER="/usr/src/linux-2.6.14.4/include/linux/fuse.h"'
+FUSECFLAGS = '-DFUSE_HEADER="/usr/src/linux-2.6.17-5mdv/include/linux/fuse.h"'
OBJS = gitobj.o api-fuse.o gnode.o topdir.o util.o tagdir.o autotree.o \
gitdir.o main.o worktree.o openfile.o gitworker.o rbtree.o pcbuf.o \
diff --git a/api-fuse.c b/api-fuse.c
index aba5088..28c5da0 100644
--- a/api-fuse.c
+++ b/api-fuse.c
@@ -146,7 +146,7 @@ struct fuse_out {
struct fuse_write_out write;
struct fuse_statfs_out statfs;
struct fuse_getxattr_out getxattr;
- struct fuse_init_in_out init;
+ struct fuse_init_in init;
char read[0];
} arg;
};
@@ -307,7 +307,7 @@ struct fuse_in {
struct fuse_getxattr_in chdr;
char name[0];
} getxattr;
- struct fuse_init_in_out init;
+ struct fuse_init_in init;
/*
* lookup, unlink, rmdir, and removexattr just take a
* string; no per-command header. symlink takes two
@@ -980,7 +980,7 @@ enum service_result api_service_poll(voi
{
union {
struct fuse_in f;
- unsigned char storage[FUSE_MAX_IN];
+ unsigned char storage[FUSE_MIN_READ_BUFFER];
} in;
int rv = read(fuse_fd, in.storage, sizeof(in.storage));
Robin Rosenberg <robin.rosenberg@dewire.com>