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


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

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

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

1.1.2.3
date	2006.10.24.08.08.24;	author jsipek;	state Exp;
branches;
next	1.1.2.4;

1.1.2.4
date	2006.10.24.08.24.45;	author jsipek;	state Exp;
branches;
next	1.1.2.5;

1.1.2.5
date	2006.10.27.15.24.18;	author jsipek;	state dead;
branches;
next	;


desc
@@


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


1.1.2.1
log
@Fix remainder of the kernel's f_{dentry,vfsmnt} usage
@
text
@a0 92
diff -r ed8030e0f7d4 mm/mempolicy.c
--- a/mm/mempolicy.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/mm/mempolicy.c	Mon Oct 23 23:27:21 2006 -0400
@@@@ -1855,7 +1855,7 @@@@ int show_numa_map(struct seq_file *m, vo
 
 	if (file) {
 		seq_printf(m, " file=");
-		seq_path(m, file->f_vfsmnt, file->f_dentry, "\n\t= ");
+		seq_path(m, file->f_path.mnt, file->f_path.dentry, "\n\t= ");
 	} else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
 		seq_printf(m, " heap");
 	} else if (vma->vm_start <= mm->start_stack &&
diff -r ed8030e0f7d4 mm/nommu.c
--- a/mm/nommu.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/mm/nommu.c	Mon Oct 23 23:27:21 2006 -0400
@@@@ -521,7 +521,7 @@@@ static int validate_mmap_request(struct 
 		 */
 		mapping = file->f_mapping;
 		if (!mapping)
-			mapping = file->f_dentry->d_inode->i_mapping;
+			mapping = file->f_path.dentry->d_inode->i_mapping;
 
 		capabilities = 0;
 		if (mapping && mapping->backing_dev_info)
@@@@ -530,7 +530,7 @@@@ static int validate_mmap_request(struct 
 		if (!capabilities) {
 			/* no explicit capabilities set, so assume some
 			 * defaults */
-			switch (file->f_dentry->d_inode->i_mode & S_IFMT) {
+			switch (file->f_path.dentry->d_inode->i_mode & S_IFMT) {
 			case S_IFREG:
 			case S_IFBLK:
 				capabilities = BDI_CAP_MAP_COPY;
@@@@ -561,11 +561,11 @@@@ static int validate_mmap_request(struct 
 			    !(file->f_mode & FMODE_WRITE))
 				return -EACCES;
 
-			if (IS_APPEND(file->f_dentry->d_inode) &&
+			if (IS_APPEND(file->f_path.dentry->d_inode) &&
 			    (file->f_mode & FMODE_WRITE))
 				return -EACCES;
 
-			if (locks_verify_locked(file->f_dentry->d_inode))
+			if (locks_verify_locked(file->f_path.dentry->d_inode))
 				return -EAGAIN;
 
 			if (!(capabilities & BDI_CAP_MAP_DIRECT))
@@@@ -596,7 +596,7 @@@@ static int validate_mmap_request(struct 
 
 		/* handle executable mappings and implied executable
 		 * mappings */
-		if (file->f_vfsmnt->mnt_flags & MNT_NOEXEC) {
+		if (file->f_path.mnt->mnt_flags & MNT_NOEXEC) {
 			if (prot & PROT_EXEC)
 				return -EPERM;
 		}
@@@@ -832,7 +832,7 @@@@ unsigned long do_mmap_pgoff(struct file 
 				continue;
 
 			/* search for overlapping mappings on the same file */
-			if (vma->vm_file->f_dentry->d_inode != file->f_dentry->d_inode)
+			if (vma->vm_file->f_path.dentry->d_inode != file->f_path.dentry->d_inode)
 				continue;
 
 			if (vma->vm_pgoff >= pgoff + pglen)
diff -r ed8030e0f7d4 mm/readahead.c
--- a/mm/readahead.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/mm/readahead.c	Mon Oct 23 23:27:21 2006 -0400
@@@@ -454,7 +454,7 @@@@ static int make_ahead_window(struct addr
  *
  * Note that @@filp is purely used for passing on to the ->readpage[s]()
  * handler: it may refer to a different file from @@mapping (so we may not use
- * @@filp->f_mapping or @@filp->f_dentry->d_inode here).
+ * @@filp->f_mapping or @@filp->f_path.dentry->d_inode here).
  * Also, @@ra may not be equal to &@@filp->f_ra.
  *
  */
diff -r ed8030e0f7d4 mm/tiny-shmem.c
--- a/mm/tiny-shmem.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/mm/tiny-shmem.c	Mon Oct 23 23:27:21 2006 -0400
@@@@ -79,8 +79,8 @@@@ struct file *shmem_file_setup(char *name
 	d_instantiate(dentry, inode);
 	inode->i_nlink = 0;	/* It is unlinked */
 
-	file->f_vfsmnt = mntget(shm_mnt);
-	file->f_dentry = dentry;
+	file->f_path.mnt = mntget(shm_mnt);
+	file->f_path.dentry = dentry;
 	file->f_mapping = inode->i_mapping;
 	file->f_op = &ramfs_file_operations;
 	file->f_mode = FMODE_WRITE | FMODE_READ;

@


1.1.2.2
log
@reorder, rename and add descriptions to the remainder of f_{dentry,vfsmnt}
patches
@
text
@a0 7
mm: change uses of f_{dentry,vfsmnt} to use f_path

This patch changes the remaining users of f_{dentry,vfsmnt} to
f_path.{dentry,mnt} in linux/mm.

Signed-off-by: Josef "Jeff" Sipek <jsipek@@cs.sunysb.edu>

@


1.1.2.3
log
@Added "From:" lines
@
text
@a2 2
From: Josef "Jeff" Sipek <jsipek@@cs.sunysb.edu>

@


1.1.2.4
log
@Small clarification on the kernel and mm patches
@
text
@d1 1
a1 1
mm: change remaining uses of f_{dentry,vfsmnt} to use f_path
@


1.1.2.5
log
@Remove old copies of the struct_file patches
@
text
@@


