From b318b3d69b852fa474576ddcb05286aa6c08577c Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Wed, 2 May 2007 17:48:09 +0000 Subject: kernel: sync with mainline... --- kernel/control.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'kernel/control.c') diff --git a/kernel/control.c b/kernel/control.c index 6b86fc0..5ffe6ba 100644 --- a/kernel/control.c +++ b/kernel/control.c @@ -77,7 +77,7 @@ struct dentry *d_alloc_name(struct dentry *parent, const char *name) { struct qstr q; - q.name = name; + q.name = (const unsigned char *) name; q.len = strlen(name); q.hash = full_name_hash(q.name, q.len); return d_alloc(parent, &q); @@ -87,7 +87,11 @@ static struct dentry *fuse_ctl_add_dentry(struct dentry *parent, struct fuse_conn *fc, const char *name, int mode, int nlink, +#ifdef KERNEL_2_6_21_PLUS + const struct inode_operations *iop, +#else struct inode_operations *iop, +#endif #ifdef KERNEL_2_6_17_PLUS const struct file_operations *fop #else -- cgit v1.2.3