Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20d29372 authored by Josef "Jeff" Sipek's avatar Josef "Jeff" Sipek Committed by Linus Torvalds
Browse files

[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: 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 7eaa36e2

fs/ntfs/dir.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

	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;

	ntfs_inode *ndir = NTFS_I(vdir);

	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) {

		ntfs_debug("Calling filldir for .. with len 2, fpos 0x1, "

				"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,

				parent_ino(filp->f_dentry), DT_DIR);

				parent_ino(filp->f_path.dentry), DT_DIR);

		if (rc)

			goto done;

		fpos++;

fs/ntfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -2162,7 +2162,7 @@ static ssize_t ntfs_file_aio_write_nolock(struct kiocb *iocb, 
		goto out;

	if (!count)

		goto out;

	err = remove_suid(file->f_dentry);

	err = remove_suid(file->f_path.dentry);

	if (err)

		goto out;

	file_update_time(file);