mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 06:33:07 +00:00
[PATCH] ntfs: 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 ntfs filesystem code. 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
7eaa36e2d4
commit
20d29372d3
2 changed files with 4 additions and 4 deletions
|
@ -1101,7 +1101,7 @@ static int ntfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
|
||||||
{
|
{
|
||||||
s64 ia_pos, ia_start, prev_ia_pos, bmp_pos;
|
s64 ia_pos, ia_start, prev_ia_pos, bmp_pos;
|
||||||
loff_t fpos, i_size;
|
loff_t fpos, i_size;
|
||||||
struct inode *bmp_vi, *vdir = filp->f_dentry->d_inode;
|
struct inode *bmp_vi, *vdir = filp->f_path.dentry->d_inode;
|
||||||
struct super_block *sb = vdir->i_sb;
|
struct super_block *sb = vdir->i_sb;
|
||||||
ntfs_inode *ndir = NTFS_I(vdir);
|
ntfs_inode *ndir = NTFS_I(vdir);
|
||||||
ntfs_volume *vol = NTFS_SB(sb);
|
ntfs_volume *vol = NTFS_SB(sb);
|
||||||
|
@ -1136,9 +1136,9 @@ static int ntfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
|
||||||
if (fpos == 1) {
|
if (fpos == 1) {
|
||||||
ntfs_debug("Calling filldir for .. with len 2, fpos 0x1, "
|
ntfs_debug("Calling filldir for .. with len 2, fpos 0x1, "
|
||||||
"inode 0x%lx, DT_DIR.",
|
"inode 0x%lx, DT_DIR.",
|
||||||
(unsigned long)parent_ino(filp->f_dentry));
|
(unsigned long)parent_ino(filp->f_path.dentry));
|
||||||
rc = filldir(dirent, "..", 2, fpos,
|
rc = filldir(dirent, "..", 2, fpos,
|
||||||
parent_ino(filp->f_dentry), DT_DIR);
|
parent_ino(filp->f_path.dentry), DT_DIR);
|
||||||
if (rc)
|
if (rc)
|
||||||
goto done;
|
goto done;
|
||||||
fpos++;
|
fpos++;
|
||||||
|
|
|
@ -2162,7 +2162,7 @@ static ssize_t ntfs_file_aio_write_nolock(struct kiocb *iocb,
|
||||||
goto out;
|
goto out;
|
||||||
if (!count)
|
if (!count)
|
||||||
goto out;
|
goto out;
|
||||||
err = remove_suid(file->f_dentry);
|
err = remove_suid(file->f_path.dentry);
|
||||||
if (err)
|
if (err)
|
||||||
goto out;
|
goto out;
|
||||||
file_update_time(file);
|
file_update_time(file);
|
||||||
|
|
Loading…
Reference in a new issue