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

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

[PATCH] ext3: 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 ext3
filesystem.

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 c29c6934

fs/ext3/dir.c

+4 −4
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static int ext3_readdir(struct file * filp, 
	struct ext3_dir_entry_2 *de;

	struct super_block *sb;

	int err;

	struct inode *inode = filp->f_dentry->d_inode;

	struct inode *inode = filp->f_path.dentry->d_inode;

	int ret = 0;



	sb = inode->i_sb;
@@ -122,7 +122,7 @@ static int ext3_readdir(struct file * filp, 
		 * We don't set the inode dirty flag since it's not

		 * critical that it get flushed back to the disk.

		 */

		EXT3_I(filp->f_dentry->d_inode)->i_flags &= ~EXT3_INDEX_FL;

		EXT3_I(filp->f_path.dentry->d_inode)->i_flags &= ~EXT3_INDEX_FL;

	}

#endif

	stored = 0;
@@ -402,7 +402,7 @@ static int call_filldir(struct file * filp, void * dirent, 
{

	struct dir_private_info *info = filp->private_data;

	loff_t	curr_pos;

	struct inode *inode = filp->f_dentry->d_inode;

	struct inode *inode = filp->f_path.dentry->d_inode;

	struct super_block * sb;

	int error;
@@ -432,7 +432,7 @@ static int ext3_dx_readdir(struct file * filp, 
			 void * dirent, filldir_t filldir)

{

	struct dir_private_info *info = filp->private_data;

	struct inode *inode = filp->f_dentry->d_inode;

	struct inode *inode = filp->f_path.dentry->d_inode;

	struct fname *fname;

	int	ret;

fs/ext3/file.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ ext3_file_write(struct kiocb *iocb, const struct iovec *iov, 
		unsigned long nr_segs, loff_t pos)

{

	struct file *file = iocb->ki_filp;

	struct inode *inode = file->f_dentry->d_inode;

	struct inode *inode = file->f_path.dentry->d_inode;

	ssize_t ret;

	int err;

fs/ext3/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd, 
#ifdef CONFIG_COMPAT

long ext3_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;



	/* These are just misnamed, they actually get/put from/to user an int */

fs/ext3/namei.c

+2 −2
Original line number Diff line number Diff line
@@ -602,7 +602,7 @@ int ext3_htree_fill_tree(struct file *dir_file, __u32 start_hash, 


	dxtrace(printk("In htree_fill_tree, start hash: %x:%x\n", start_hash,

		       start_minor_hash));

	dir = dir_file->f_dentry->d_inode;

	dir = dir_file->f_path.dentry->d_inode;

	if (!(EXT3_I(dir)->i_flags & EXT3_INDEX_FL)) {

		hinfo.hash_version = EXT3_SB(dir->i_sb)->s_def_hash_version;

		hinfo.seed = EXT3_SB(dir->i_sb)->s_hash_seed;
@@ -613,7 +613,7 @@ int ext3_htree_fill_tree(struct file *dir_file, __u32 start_hash, 
	}

	hinfo.hash = start_hash;

	hinfo.minor_hash = 0;

	frame = dx_probe(NULL, dir_file->f_dentry->d_inode, &hinfo, frames, &err);

	frame = dx_probe(NULL, dir_file->f_path.dentry->d_inode, &hinfo, frames, &err);

	if (!frame)

		return err;