aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/fat/dir.c6
-rw-r--r--fs/fat/file.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/fat/dir.c b/fs/fat/dir.c
index 69c439f44387..c16af246d245 100644
--- a/fs/fat/dir.c
+++ b/fs/fat/dir.c
@@ -579,7 +579,7 @@ parse_record:
579 if (!memcmp(de->name, MSDOS_DOT, MSDOS_NAME)) 579 if (!memcmp(de->name, MSDOS_DOT, MSDOS_NAME))
580 inum = inode->i_ino; 580 inum = inode->i_ino;
581 else if (!memcmp(de->name, MSDOS_DOTDOT, MSDOS_NAME)) { 581 else if (!memcmp(de->name, MSDOS_DOTDOT, MSDOS_NAME)) {
582 inum = parent_ino(filp->f_dentry); 582 inum = parent_ino(filp->f_path.dentry);
583 } else { 583 } else {
584 loff_t i_pos = fat_make_i_pos(sb, bh, de); 584 loff_t i_pos = fat_make_i_pos(sb, bh, de);
585 struct inode *tmp = fat_iget(sb, i_pos); 585 struct inode *tmp = fat_iget(sb, i_pos);
@@ -643,7 +643,7 @@ out:
643 643
644static int fat_readdir(struct file *filp, void *dirent, filldir_t filldir) 644static int fat_readdir(struct file *filp, void *dirent, filldir_t filldir)
645{ 645{
646 struct inode *inode = filp->f_dentry->d_inode; 646 struct inode *inode = filp->f_path.dentry->d_inode;
647 return __fat_readdir(inode, filp, dirent, filldir, 0, 0); 647 return __fat_readdir(inode, filp, dirent, filldir, 0, 0);
648} 648}
649 649
@@ -782,7 +782,7 @@ static long fat_compat_dir_ioctl(struct file *file, unsigned cmd,
782 782
783 set_fs(KERNEL_DS); 783 set_fs(KERNEL_DS);
784 lock_kernel(); 784 lock_kernel();
785 ret = fat_dir_ioctl(file->f_dentry->d_inode, file, 785 ret = fat_dir_ioctl(file->f_path.dentry->d_inode, file,
786 cmd, (unsigned long) &d); 786 cmd, (unsigned long) &d);
787 unlock_kernel(); 787 unlock_kernel();
788 set_fs(oldfs); 788 set_fs(oldfs);
diff --git a/fs/fat/file.c b/fs/fat/file.c
index 0aa813d944a6..c1237b70c1fe 100644
--- a/fs/fat/file.c
+++ b/fs/fat/file.c
@@ -92,7 +92,7 @@ int fat_generic_ioctl(struct inode *inode, struct file *filp,
92 } 92 }
93 93
94 /* This MUST be done before doing anything irreversible... */ 94 /* This MUST be done before doing anything irreversible... */
95 err = notify_change(filp->f_dentry, &ia); 95 err = notify_change(filp->f_path.dentry, &ia);
96 if (err) 96 if (err)
97 goto up; 97 goto up;
98 98