diff options
Diffstat (limited to 'fs/ntfs')
-rw-r--r-- | fs/ntfs/dir.c | 6 | ||||
-rw-r--r-- | fs/ntfs/file.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c index 85c36b8ca452..8296c29ae3b8 100644 --- a/fs/ntfs/dir.c +++ b/fs/ntfs/dir.c | |||
@@ -1101,7 +1101,7 @@ static int ntfs_readdir(struct file *filp, void *dirent, filldir_t filldir) | |||
1101 | { | 1101 | { |
1102 | s64 ia_pos, ia_start, prev_ia_pos, bmp_pos; | 1102 | s64 ia_pos, ia_start, prev_ia_pos, bmp_pos; |
1103 | loff_t fpos, i_size; | 1103 | loff_t fpos, i_size; |
1104 | struct inode *bmp_vi, *vdir = filp->f_dentry->d_inode; | 1104 | struct inode *bmp_vi, *vdir = filp->f_path.dentry->d_inode; |
1105 | struct super_block *sb = vdir->i_sb; | 1105 | struct super_block *sb = vdir->i_sb; |
1106 | ntfs_inode *ndir = NTFS_I(vdir); | 1106 | ntfs_inode *ndir = NTFS_I(vdir); |
1107 | ntfs_volume *vol = NTFS_SB(sb); | 1107 | ntfs_volume *vol = NTFS_SB(sb); |
@@ -1136,9 +1136,9 @@ static int ntfs_readdir(struct file *filp, void *dirent, filldir_t filldir) | |||
1136 | if (fpos == 1) { | 1136 | if (fpos == 1) { |
1137 | ntfs_debug("Calling filldir for .. with len 2, fpos 0x1, " | 1137 | ntfs_debug("Calling filldir for .. with len 2, fpos 0x1, " |
1138 | "inode 0x%lx, DT_DIR.", | 1138 | "inode 0x%lx, DT_DIR.", |
1139 | (unsigned long)parent_ino(filp->f_dentry)); | 1139 | (unsigned long)parent_ino(filp->f_path.dentry)); |
1140 | rc = filldir(dirent, "..", 2, fpos, | 1140 | rc = filldir(dirent, "..", 2, fpos, |
1141 | parent_ino(filp->f_dentry), DT_DIR); | 1141 | parent_ino(filp->f_path.dentry), DT_DIR); |
1142 | if (rc) | 1142 | if (rc) |
1143 | goto done; | 1143 | goto done; |
1144 | fpos++; | 1144 | fpos++; |
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c index ae2fe0016d2c..076c9420c257 100644 --- a/fs/ntfs/file.c +++ b/fs/ntfs/file.c | |||
@@ -2162,7 +2162,7 @@ static ssize_t ntfs_file_aio_write_nolock(struct kiocb *iocb, | |||
2162 | goto out; | 2162 | goto out; |
2163 | if (!count) | 2163 | if (!count) |
2164 | goto out; | 2164 | goto out; |
2165 | err = remove_suid(file->f_dentry); | 2165 | err = remove_suid(file->f_path.dentry); |
2166 | if (err) | 2166 | if (err) |
2167 | goto out; | 2167 | goto out; |
2168 | file_update_time(file); | 2168 | file_update_time(file); |