aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/ext2/dir.c2
-rw-r--r--fs/ext2/ioctl.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext2/dir.c b/fs/ext2/dir.c
index 3e7a84a1e509..0b02ba9642d2 100644
--- a/fs/ext2/dir.c
+++ b/fs/ext2/dir.c
@@ -248,7 +248,7 @@ static int
248ext2_readdir (struct file * filp, void * dirent, filldir_t filldir) 248ext2_readdir (struct file * filp, void * dirent, filldir_t filldir)
249{ 249{
250 loff_t pos = filp->f_pos; 250 loff_t pos = filp->f_pos;
251 struct inode *inode = filp->f_dentry->d_inode; 251 struct inode *inode = filp->f_path.dentry->d_inode;
252 struct super_block *sb = inode->i_sb; 252 struct super_block *sb = inode->i_sb;
253 unsigned int offset = pos & ~PAGE_CACHE_MASK; 253 unsigned int offset = pos & ~PAGE_CACHE_MASK;
254 unsigned long n = pos >> PAGE_CACHE_SHIFT; 254 unsigned long n = pos >> PAGE_CACHE_SHIFT;
diff --git a/fs/ext2/ioctl.c b/fs/ext2/ioctl.c
index e3cf8c81507f..4b099d310712 100644
--- a/fs/ext2/ioctl.c
+++ b/fs/ext2/ioctl.c
@@ -90,7 +90,7 @@ int ext2_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
90#ifdef CONFIG_COMPAT 90#ifdef CONFIG_COMPAT
91long ext2_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 91long ext2_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
92{ 92{
93 struct inode *inode = file->f_dentry->d_inode; 93 struct inode *inode = file->f_path.dentry->d_inode;
94 int ret; 94 int ret;
95 95
96 /* These are just misnamed, they actually get/put from/to user an int */ 96 /* These are just misnamed, they actually get/put from/to user an int */