head	1.1;
access;
symbols
	LKML-branch:1.1.0.2;
locks; strict;
comment	@# @;


1.1
date	2006.10.20.00.32.08;	author jsipek;	state dead;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2006.10.20.00.32.08;	author jsipek;	state Exp;
branches;
next	1.1.2.2;

1.1.2.2
date	2006.10.21.05.28.25;	author jsipek;	state Exp;
branches;
next	1.1.2.3;

1.1.2.3
date	2006.10.24.06.05.37;	author jsipek;	state dead;
branches;
next	;


desc
@@


1.1
log
@file struct_file-ext4 was initially added on branch LKML-branch.
@
text
@@


1.1.2.1
log
@Patches included in -mm:
+reiserfs-struct_path
+md-struct_path
+struct_path
+struct_path-ecryptfs

Ext[234] struct file changes
@
text
@a0 84
diff -r a09b2fc2687a fs/ext4/dir.c
--- a/fs/ext4/dir.c	Thu Oct 19 13:09:18 2006 -0400
+++ b/fs/ext4/dir.c	Thu Oct 19 13:12:32 2006 -0400
@@@@ -103,7 +103,7 @@@@ static int ext4_readdir(struct file * fi
 	struct ext4_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 ext4_readdir(struct file * fi
 		 * We don't set the inode dirty flag since it's not
 		 * critical that it get flushed back to the disk.
 		 */
-		EXT4_I(filp->f_dentry->d_inode)->i_flags &= ~EXT4_INDEX_FL;
+		EXT4_I(filp->f_path.dentry->d_inode)->i_flags &= ~EXT4_INDEX_FL;
 	}
 #endif
 	stored = 0;
@@@@ -399,7 +399,7 @@@@ static int call_filldir(struct file * fi
 {
 	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;
 
@@@@ -429,7 +429,7 @@@@ static int ext4_dx_readdir(struct file *
 			 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;
 
diff -r a09b2fc2687a fs/ext4/file.c
--- a/fs/ext4/file.c	Thu Oct 19 13:09:18 2006 -0400
+++ b/fs/ext4/file.c	Thu Oct 19 13:12:36 2006 -0400
@@@@ -52,7 +52,7 @@@@ ext4_file_write(struct kiocb *iocb, cons
 		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;
 
diff -r a09b2fc2687a fs/ext4/ioctl.c
--- a/fs/ext4/ioctl.c	Thu Oct 19 13:09:18 2006 -0400
+++ b/fs/ext4/ioctl.c	Thu Oct 19 13:12:41 2006 -0400
@@@@ -256,7 +256,7 @@@@ flags_err:
 #ifdef CONFIG_COMPAT
 long ext4_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 */
diff -r a09b2fc2687a fs/ext4/namei.c
--- a/fs/ext4/namei.c	Thu Oct 19 13:09:18 2006 -0400
+++ b/fs/ext4/namei.c	Thu Oct 19 13:12:51 2006 -0400
@@@@ -593,7 +593,7 @@@@ int ext4_htree_fill_tree(struct file *di
 
 	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 (!(EXT4_I(dir)->i_flags & EXT4_INDEX_FL)) {
 		hinfo.hash_version = EXT4_SB(dir->i_sb)->s_def_hash_version;
 		hinfo.seed = EXT4_SB(dir->i_sb)->s_hash_seed;
@@@@ -604,7 +604,7 @@@@ int ext4_htree_fill_tree(struct file *di
 	}
 	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;
 
@


1.1.2.2
log
@struct file patches - descriptions
@
text
@a0 5
ext4: change uses of f_{dentry,vfsmnt} to use f_path

This patch changes all the uses of f_{dentry,vfsmnt} to f_path.{dentry,mnt}
in the ext4 filesystem.

@


1.1.2.3
log
@Move patches already in mm into a subdir
@
text
@@


