X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fhppfs%2Fhppfs_kern.c;h=a44dc58973991b6ff33274ee2f6eaf2a6ca28ca3;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=5e6363be246f6026bc45f340fc7aa83db5b5d5ef;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git diff --git a/fs/hppfs/hppfs_kern.c b/fs/hppfs/hppfs_kern.c index 5e6363be2..a44dc5897 100644 --- a/fs/hppfs/hppfs_kern.c +++ b/fs/hppfs/hppfs_kern.c @@ -216,10 +216,10 @@ static struct dentry *hppfs_lookup(struct inode *ino, struct dentry *dentry, static struct inode_operations hppfs_file_iops = { }; -static ssize_t read_proc(struct file *file, char __user *buf, ssize_t count, +static ssize_t read_proc(struct file *file, char *buf, ssize_t count, loff_t *ppos, int is_user) { - ssize_t (*read)(struct file *, char __user *, size_t, loff_t *); + ssize_t (*read)(struct file *, char *, size_t, loff_t *); ssize_t n; read = file->f_dentry->d_inode->i_fop->read; @@ -236,7 +236,7 @@ static ssize_t read_proc(struct file *file, char __user *buf, ssize_t count, return n; } -static ssize_t hppfs_read_file(int fd, char __user *buf, ssize_t count) +static ssize_t hppfs_read_file(int fd, char *buf, ssize_t count) { ssize_t n; int cur, err; @@ -274,7 +274,7 @@ static ssize_t hppfs_read_file(int fd, char __user *buf, ssize_t count) return n; } -static ssize_t hppfs_read(struct file *file, char __user *buf, size_t count, +static ssize_t hppfs_read(struct file *file, char *buf, size_t count, loff_t *ppos) { struct hppfs_private *hppfs = file->private_data; @@ -313,12 +313,12 @@ static ssize_t hppfs_read(struct file *file, char __user *buf, size_t count, return(count); } -static ssize_t hppfs_write(struct file *file, const char __user *buf, size_t len, +static ssize_t hppfs_write(struct file *file, const char *buf, size_t len, loff_t *ppos) { struct hppfs_private *data = file->private_data; struct file *proc_file = data->proc_file; - ssize_t (*write)(struct file *, const char __user *, size_t, loff_t *); + ssize_t (*write)(struct file *, const char *, size_t, loff_t *); int err; write = proc_file->f_dentry->d_inode->i_fop->write; @@ -558,7 +558,7 @@ static loff_t hppfs_llseek(struct file *file, loff_t off, int where) return(default_llseek(file, off, where)); } -static const struct file_operations hppfs_file_fops = { +static struct file_operations hppfs_file_fops = { .owner = NULL, .llseek = hppfs_llseek, .read = hppfs_read, @@ -609,7 +609,7 @@ static int hppfs_fsync(struct file *file, struct dentry *dentry, int datasync) return(0); } -static const struct file_operations hppfs_dir_fops = { +static struct file_operations hppfs_dir_fops = { .owner = NULL, .readdir = hppfs_readdir, .open = hppfs_dir_open, @@ -658,7 +658,7 @@ static struct super_operations hppfs_sbops = { .statfs = hppfs_statfs, }; -static int hppfs_readlink(struct dentry *dentry, char __user *buffer, int buflen) +static int hppfs_readlink(struct dentry *dentry, char *buffer, int buflen) { struct file *proc_file; struct dentry *proc_dentry;