[PATCH] ext2: 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 ext2 filesystem. Signed-off-by: Josef "Jeff" Sipek <jsipek@cs.sunysb.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
2fddfeefee
commit
c29c693430
|
@ -248,7 +248,7 @@ static int
|
||||||
ext2_readdir (struct file * filp, void * dirent, filldir_t filldir)
|
ext2_readdir (struct file * filp, void * dirent, filldir_t filldir)
|
||||||
{
|
{
|
||||||
loff_t pos = filp->f_pos;
|
loff_t pos = filp->f_pos;
|
||||||
struct inode *inode = filp->f_dentry->d_inode;
|
struct inode *inode = filp->f_path.dentry->d_inode;
|
||||||
struct super_block *sb = inode->i_sb;
|
struct super_block *sb = inode->i_sb;
|
||||||
unsigned int offset = pos & ~PAGE_CACHE_MASK;
|
unsigned int offset = pos & ~PAGE_CACHE_MASK;
|
||||||
unsigned long n = pos >> PAGE_CACHE_SHIFT;
|
unsigned long n = pos >> PAGE_CACHE_SHIFT;
|
||||||
|
|
|
@ -90,7 +90,7 @@ int ext2_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
|
||||||
#ifdef CONFIG_COMPAT
|
#ifdef CONFIG_COMPAT
|
||||||
long ext2_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
|
long ext2_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
|
||||||
{
|
{
|
||||||
struct inode *inode = file->f_dentry->d_inode;
|
struct inode *inode = file->f_path.dentry->d_inode;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
/* These are just misnamed, they actually get/put from/to user an int */
|
/* These are just misnamed, they actually get/put from/to user an int */
|
||||||
|
|
Loading…
Reference in a new issue