From 927967f9a47191abe9fa8ef2cec5b60e904481c6 Mon Sep 17 00:00:00 2001 From: short <> Date: Sun, 28 Sep 2003 14:27:13 +0000 Subject: [PATCH] Linux kernel 2.5.x driver ported to 2.6.x. - Patch provided by Martin Drab. --- kernel/Linux/2.5/dir.c | 10 +++++----- kernel/Linux/2.5/file.c | 2 +- kernel/Linux/2.5/inode.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kernel/Linux/2.5/dir.c b/kernel/Linux/2.5/dir.c index 0835ad8..3eda2bc 100644 --- a/kernel/Linux/2.5/dir.c +++ b/kernel/Linux/2.5/dir.c @@ -42,9 +42,9 @@ extern int lufs_notify_change(struct dentry*, struct iattr*); static int lu_readdir(struct file*, void*, filldir_t); -static struct dentry *lu_lookup(struct inode*, struct dentry*); +static struct dentry *lu_lookup(struct inode*, struct dentry*, struct nameidata *); static int lu_mkdir(struct inode*, struct dentry*, int); -static int lu_create(struct inode*, struct dentry*, int); +static int lu_create(struct inode*, struct dentry*, int, struct nameidata *); static int lu_rmdir(struct inode*, struct dentry*); static int lu_rename(struct inode*, struct dentry*, struct inode*, struct dentry*); static int lu_unlink(struct inode*, struct dentry*); @@ -68,7 +68,7 @@ struct inode_operations lu_dir_inode_operations = { .setattr = lufs_notify_change, }; -static int lu_lookup_validate(struct dentry *dentry, int flags) +static int lu_lookup_validate(struct dentry *dentry, struct nameidata *nd) { struct inode *inode = dentry->d_inode; unsigned long age = jiffies - dentry->d_time; @@ -188,7 +188,7 @@ static int lu_readdir(struct file *f, void *dirent, filldir_t filldir) return res; } -static struct dentry* lu_lookup(struct inode *dir, struct dentry *dentry) +static struct dentry* lu_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd) { int res; struct lufs_fattr fattr; @@ -328,7 +328,7 @@ static int lu_mkdir(struct inode *dir, struct dentry *dentry, int mode) return res; } -static int lu_create(struct inode *dir, struct dentry *dentry, int mode) +static int lu_create(struct inode *dir, struct dentry *dentry, int mode, struct nameidata *nd) { int res; struct server_slot *slot; diff --git a/kernel/Linux/2.5/file.c b/kernel/Linux/2.5/file.c index 074a2ff..4441ef5 100644 --- a/kernel/Linux/2.5/file.c +++ b/kernel/Linux/2.5/file.c @@ -303,7 +303,7 @@ struct file_operations lu_file_operations = { .mmap = lu_file_mmap, .open = lu_file_open, .release = lu_file_release, - :fsync = lu_file_fsync, + .fsync = lu_file_fsync, }; struct inode_operations lu_file_inode_operations = { diff --git a/kernel/Linux/2.5/inode.c b/kernel/Linux/2.5/inode.c index 9ef652a..4adf0e4 100644 --- a/kernel/Linux/2.5/inode.c +++ b/kernel/Linux/2.5/inode.c @@ -53,7 +53,7 @@ extern struct dentry_operations lufs_dentry_operations; static void lu_delete_inode(struct inode*); static void lu_put_super(struct super_block*); -static int lu_statfs(struct super_block*, struct statfs*); +static int lu_statfs(struct super_block*, struct kstatfs*); static struct super_operations lu_sops = { .drop_inode = generic_delete_inode, @@ -383,7 +383,7 @@ struct inode* lu_iget(struct super_block *sb, struct lufs_fattr *fattr) return res; } -static int lu_statfs(struct super_block *sb, struct statfs *attr) +static int lu_statfs(struct super_block *sb, struct kstatfs *attr) { int res; struct iovec riov; @@ -532,7 +532,7 @@ static int lu_fill_super(struct super_block *sb, void *opts, int silent) return -EINVAL; } -static struct super_block *lu_get_sb(struct file_system_type *fs_type, int flags, char *dev_name, void *data) +static struct super_block *lu_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) { return get_sb_nodev(fs_type, flags, data, lu_fill_super); } -- 1.8.3.1