diff options
-rw-r--r-- | fs/hppfs/hppfs_kern.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/hppfs/hppfs_kern.c b/fs/hppfs/hppfs_kern.c index 642675fc394a..afd340a45da4 100644 --- a/fs/hppfs/hppfs_kern.c +++ b/fs/hppfs/hppfs_kern.c | |||
@@ -221,7 +221,7 @@ static ssize_t read_proc(struct file *file, char __user *buf, ssize_t count, | |||
221 | ssize_t (*read)(struct file *, char __user *, size_t, loff_t *); | 221 | ssize_t (*read)(struct file *, char __user *, size_t, loff_t *); |
222 | ssize_t n; | 222 | ssize_t n; |
223 | 223 | ||
224 | read = file->f_dentry->d_inode->i_fop->read; | 224 | read = file->f_path.dentry->d_inode->i_fop->read; |
225 | 225 | ||
226 | if(!is_user) | 226 | if(!is_user) |
227 | set_fs(KERNEL_DS); | 227 | set_fs(KERNEL_DS); |
@@ -320,7 +320,7 @@ static ssize_t hppfs_write(struct file *file, const char __user *buf, size_t len | |||
320 | ssize_t (*write)(struct file *, const char __user *, size_t, loff_t *); | 320 | ssize_t (*write)(struct file *, const char __user *, size_t, loff_t *); |
321 | int err; | 321 | int err; |
322 | 322 | ||
323 | write = proc_file->f_dentry->d_inode->i_fop->write; | 323 | write = proc_file->f_path.dentry->d_inode->i_fop->write; |
324 | 324 | ||
325 | proc_file->f_pos = file->f_pos; | 325 | proc_file->f_pos = file->f_pos; |
326 | err = (*write)(proc_file, buf, len, &proc_file->f_pos); | 326 | err = (*write)(proc_file, buf, len, &proc_file->f_pos); |
@@ -464,7 +464,7 @@ static int hppfs_open(struct inode *inode, struct file *file) | |||
464 | if(data == NULL) | 464 | if(data == NULL) |
465 | goto out; | 465 | goto out; |
466 | 466 | ||
467 | host_file = dentry_name(file->f_dentry, strlen("/rw")); | 467 | host_file = dentry_name(file->f_path.dentry, strlen("/rw")); |
468 | if(host_file == NULL) | 468 | if(host_file == NULL) |
469 | goto out_free2; | 469 | goto out_free2; |
470 | 470 | ||
@@ -547,7 +547,7 @@ static loff_t hppfs_llseek(struct file *file, loff_t off, int where) | |||
547 | loff_t (*llseek)(struct file *, loff_t, int); | 547 | loff_t (*llseek)(struct file *, loff_t, int); |
548 | loff_t ret; | 548 | loff_t ret; |
549 | 549 | ||
550 | llseek = proc_file->f_dentry->d_inode->i_fop->llseek; | 550 | llseek = proc_file->f_path.dentry->d_inode->i_fop->llseek; |
551 | if(llseek != NULL){ | 551 | if(llseek != NULL){ |
552 | ret = (*llseek)(proc_file, off, where); | 552 | ret = (*llseek)(proc_file, off, where); |
553 | if(ret < 0) | 553 | if(ret < 0) |
@@ -591,10 +591,10 @@ static int hppfs_readdir(struct file *file, void *ent, filldir_t filldir) | |||
591 | struct hppfs_dirent dirent = ((struct hppfs_dirent) | 591 | struct hppfs_dirent dirent = ((struct hppfs_dirent) |
592 | { .vfs_dirent = ent, | 592 | { .vfs_dirent = ent, |
593 | .filldir = filldir, | 593 | .filldir = filldir, |
594 | .dentry = file->f_dentry } ); | 594 | .dentry = file->f_path.dentry } ); |
595 | int err; | 595 | int err; |
596 | 596 | ||
597 | readdir = proc_file->f_dentry->d_inode->i_fop->readdir; | 597 | readdir = proc_file->f_path.dentry->d_inode->i_fop->readdir; |
598 | 598 | ||
599 | proc_file->f_pos = file->f_pos; | 599 | proc_file->f_pos = file->f_pos; |
600 | err = (*readdir)(proc_file, &dirent, hppfs_filldir); | 600 | err = (*readdir)(proc_file, &dirent, hppfs_filldir); |