aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiklos Szeredi <miklos@szeredi.hu>2006-09-30 06:17:31 +0000
committerMiklos Szeredi <miklos@szeredi.hu>2006-09-30 06:17:31 +0000
commit40ec17587bfee44180bc6b656545ead51a1a2037 (patch)
tree63d62aa786c082b087e8845d112aa293fc9f78d1
parent07cf0feb2efeea4d90bcf700438a4bb4f97607dd (diff)
downloadlibfuse-40ec17587bfee44180bc6b656545ead51a1a2037.tar.gz
Fix compilation on 2.6.9
-rw-r--r--ChangeLog4
-rw-r--r--kernel/control.c11
2 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e985792..5f75e15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-29 Miklos Szeredi <miklos@szeredi.hu>
+
+ * Fix compilation on 2.6.9. Report from Troy Ayers
+
2006-09-27 Miklos Szeredi <miklos@szeredi.hu>
* Fix Oops in fuse_readpages(). Reported by David Shaw
diff --git a/kernel/control.c b/kernel/control.c
index 28956ef..380630d 100644
--- a/kernel/control.c
+++ b/kernel/control.c
@@ -69,6 +69,17 @@ static struct file_operations fuse_ctl_waiting_ops = {
.read = fuse_conn_waiting_read,
};
+#ifndef KERNEL_2_6_10_PLUS
+struct dentry *d_alloc_name(struct dentry *parent, const char *name)
+{
+ struct qstr q;
+
+ q.name = name;
+ q.len = strlen(name);
+ q.hash = full_name_hash(q.name, q.len);
+ return d_alloc(parent, &q);
+}
+#endif
static struct dentry *fuse_ctl_add_dentry(struct dentry *parent,
struct fuse_conn *fc,
const char *name,