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


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

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

1.1.2.2
date	2007.01.05.08.33.49;	author jsipek;	state dead;
branches;
next	;


desc
@@


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


1.1.2.1
log
@Move patches already in mm into a subdir
@
text
@a0 39
isofs: 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 isofs filesystem.

diff -r 1cba4cc86e39 fs/isofs/compress.c
--- a/fs/isofs/compress.c	Thu Oct 19 20:35:52 2006 -0400
+++ b/fs/isofs/compress.c	Thu Oct 19 20:37:34 2006 -0400
@@@@ -42,7 +42,7 @@@@ static struct semaphore zisofs_zlib_sema
  */
 static int zisofs_readpage(struct file *file, struct page *page)
 {
-	struct inode *inode = file->f_dentry->d_inode;
+	struct inode *inode = file->f_path.dentry->d_inode;
 	struct address_space *mapping = inode->i_mapping;
 	unsigned int maxpage, xpage, fpage, blockindex;
 	unsigned long offset;
diff -r 1cba4cc86e39 fs/isofs/dir.c
--- a/fs/isofs/dir.c	Thu Oct 19 20:35:52 2006 -0400
+++ b/fs/isofs/dir.c	Thu Oct 19 20:39:51 2006 -0400
@@@@ -183,7 +183,7 @@@@ static int do_isofs_readdir(struct inode
 
 		/* Handle the case of the '..' directory */
 		if (de->name_len[0] == 1 && de->name[0] == 1) {
-			inode_number = parent_ino(filp->f_dentry);
+			inode_number = parent_ino(filp->f_path.dentry);
 			if (filldir(dirent, "..", 2, filp->f_pos, inode_number, DT_DIR) < 0)
 				break;
 			filp->f_pos += de_len;
@@@@ -255,8 +255,7 @@@@ static int isofs_readdir(struct file *fi
 	int result;
 	char * tmpname;
 	struct iso_directory_record * tmpde;
-	struct inode *inode = filp->f_dentry->d_inode;
-
+	struct inode *inode = filp->f_path.dentry->d_inode;
 
 	tmpname = (char *)__get_free_page(GFP_KERNEL);
 	if (tmpname == NULL)
@


1.1.2.2
log
@Removed many patches already in vanilla
@
text
@@


