diff options
| author | Miklos Szeredi <miklos@szeredi.hu> | 2007-05-02 17:48:09 +0000 |
|---|---|---|
| committer | Miklos Szeredi <miklos@szeredi.hu> | 2007-05-02 17:48:09 +0000 |
| commit | b318b3d69b852fa474576ddcb05286aa6c08577c (patch) | |
| tree | e98bbcda283c0fdeb3ddfdc3c0dbcceffc37066f /kernel/control.c | |
| parent | 79b6209843823ff2776c79563748e18db1b1c946 (diff) | |
| download | libfuse-b318b3d69b852fa474576ddcb05286aa6c08577c.tar.gz | |
kernel: sync with mainline...
Diffstat (limited to 'kernel/control.c')
| -rw-r--r-- | kernel/control.c | 6 |
1 files changed, 5 insertions, 1 deletions
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 |