Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 471b17e7ed0cb29338458eaa09103902891d802a

Authored by Josef Sipek
Committed by Linus Torvalds
1 parent 575800b3cc
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] struct path: convert hppfs 

Signed-off-by: Josef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 6 additions and 6 deletions Side-by-side Diff

fs/hppfs/hppfs_kern.c
Diff comments   View file @ 471b17e
... ... @@ -221,7 +221,7 @@
221 221 ssize_t (*read)(struct file *, char __user *, size_t, loff_t *);
222 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 226 if(!is_user)
227 227 set_fs(KERNEL_DS);
... ... @@ -320,7 +320,7 @@
320 320 ssize_t (*write)(struct file *, const char __user *, size_t, loff_t *);
321 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 325 proc_file->f_pos = file->f_pos;
326 326 err = (*write)(proc_file, buf, len, &proc_file->f_pos);
... ... @@ -464,7 +464,7 @@
464 464 if(data == NULL)
465 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 468 if(host_file == NULL)
469 469 goto out_free2;
470 470  
... ... @@ -547,7 +547,7 @@
547 547 loff_t (*llseek)(struct file *, loff_t, int);
548 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 551 if(llseek != NULL){
552 552 ret = (*llseek)(proc_file, off, where);
553 553 if(ret < 0)
554 554  
... ... @@ -591,10 +591,10 @@
591 591 struct hppfs_dirent dirent = ((struct hppfs_dirent)
592 592 { .vfs_dirent = ent,
593 593 .filldir = filldir,
594   - .dentry = file->f_dentry } );
  594 + .dentry = file->f_path.dentry } );
595 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 599 proc_file->f_pos = file->f_pos;
600 600 err = (*readdir)(proc_file, &dirent, hppfs_filldir);