Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 24864
b: refs/heads/master
c: 347f217
h: refs/heads/master
v: v3
  • Loading branch information
Al Viro authored and Linus Torvalds committed Mar 31, 2006
1 parent bbfb9e3 commit 42ad406
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4d338e1accfc3473f7e453427dfd4f1ebf4dbbe6
refs/heads/master: 347f217cec74dc6b5a9b8e77c4b15f5a6879ec1a
14 changes: 7 additions & 7 deletions trunk/fs/hppfs/hppfs_kern.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 *buf, ssize_t count,
static ssize_t read_proc(struct file *file, char __user *buf, ssize_t count,
loff_t *ppos, int is_user)
{
ssize_t (*read)(struct file *, char *, size_t, loff_t *);
ssize_t (*read)(struct file *, char __user *, size_t, loff_t *);
ssize_t n;

read = file->f_dentry->d_inode->i_fop->read;
Expand All @@ -236,7 +236,7 @@ static ssize_t read_proc(struct file *file, char *buf, ssize_t count,
return n;
}

static ssize_t hppfs_read_file(int fd, char *buf, ssize_t count)
static ssize_t hppfs_read_file(int fd, char __user *buf, ssize_t count)
{
ssize_t n;
int cur, err;
Expand Down Expand Up @@ -274,7 +274,7 @@ static ssize_t hppfs_read_file(int fd, char *buf, ssize_t count)
return n;
}

static ssize_t hppfs_read(struct file *file, char *buf, size_t count,
static ssize_t hppfs_read(struct file *file, char __user *buf, size_t count,
loff_t *ppos)
{
struct hppfs_private *hppfs = file->private_data;
Expand Down Expand Up @@ -313,12 +313,12 @@ static ssize_t hppfs_read(struct file *file, char *buf, size_t count,
return(count);
}

static ssize_t hppfs_write(struct file *file, const char *buf, size_t len,
static ssize_t hppfs_write(struct file *file, const char __user *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 *, size_t, loff_t *);
ssize_t (*write)(struct file *, const char __user *, size_t, loff_t *);
int err;

write = proc_file->f_dentry->d_inode->i_fop->write;
Expand Down Expand Up @@ -658,7 +658,7 @@ static struct super_operations hppfs_sbops = {
.statfs = hppfs_statfs,
};

static int hppfs_readlink(struct dentry *dentry, char *buffer, int buflen)
static int hppfs_readlink(struct dentry *dentry, char __user *buffer, int buflen)
{
struct file *proc_file;
struct dentry *proc_dentry;
Expand Down

0 comments on commit 42ad406

Please sign in to comment.