Commit dba32306 authored by Josef "Jeff" Sipek's avatar Josef "Jeff" Sipek Committed by Linus Torvalds

[PATCH] fat: change uses of f_{dentry,vfsmnt} to use f_path

Change all the uses of f_{dentry,vfsmnt} to f_path.{dentry,mnt} in the fat
filesystem.
Signed-off-by: default avatarJosef "Jeff" Sipek <jsipek@cs.sunysb.edu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9d549890
...@@ -579,7 +579,7 @@ static int __fat_readdir(struct inode *inode, struct file *filp, void *dirent, ...@@ -579,7 +579,7 @@ static int __fat_readdir(struct inode *inode, struct file *filp, void *dirent,
if (!memcmp(de->name, MSDOS_DOT, MSDOS_NAME)) if (!memcmp(de->name, MSDOS_DOT, MSDOS_NAME))
inum = inode->i_ino; inum = inode->i_ino;
else if (!memcmp(de->name, MSDOS_DOTDOT, MSDOS_NAME)) { else if (!memcmp(de->name, MSDOS_DOTDOT, MSDOS_NAME)) {
inum = parent_ino(filp->f_dentry); inum = parent_ino(filp->f_path.dentry);
} else { } else {
loff_t i_pos = fat_make_i_pos(sb, bh, de); loff_t i_pos = fat_make_i_pos(sb, bh, de);
struct inode *tmp = fat_iget(sb, i_pos); struct inode *tmp = fat_iget(sb, i_pos);
...@@ -643,7 +643,7 @@ static int __fat_readdir(struct inode *inode, struct file *filp, void *dirent, ...@@ -643,7 +643,7 @@ static int __fat_readdir(struct inode *inode, struct file *filp, void *dirent,
static int fat_readdir(struct file *filp, void *dirent, filldir_t filldir) static int fat_readdir(struct file *filp, void *dirent, filldir_t filldir)
{ {
struct inode *inode = filp->f_dentry->d_inode; struct inode *inode = filp->f_path.dentry->d_inode;
return __fat_readdir(inode, filp, dirent, filldir, 0, 0); return __fat_readdir(inode, filp, dirent, filldir, 0, 0);
} }
...@@ -782,7 +782,7 @@ static long fat_compat_dir_ioctl(struct file *file, unsigned cmd, ...@@ -782,7 +782,7 @@ static long fat_compat_dir_ioctl(struct file *file, unsigned cmd,
set_fs(KERNEL_DS); set_fs(KERNEL_DS);
lock_kernel(); lock_kernel();
ret = fat_dir_ioctl(file->f_dentry->d_inode, file, ret = fat_dir_ioctl(file->f_path.dentry->d_inode, file,
cmd, (unsigned long) &d); cmd, (unsigned long) &d);
unlock_kernel(); unlock_kernel();
set_fs(oldfs); set_fs(oldfs);
......
...@@ -92,7 +92,7 @@ int fat_generic_ioctl(struct inode *inode, struct file *filp, ...@@ -92,7 +92,7 @@ int fat_generic_ioctl(struct inode *inode, struct file *filp,
} }
/* This MUST be done before doing anything irreversible... */ /* This MUST be done before doing anything irreversible... */
err = notify_change(filp->f_dentry, &ia); err = notify_change(filp->f_path.dentry, &ia);
if (err) if (err)
goto up; goto up;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment