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


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

1.1.2.1
date	2006.10.27.02.13.55;	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 kernel was initially added on branch LKML-branch.
@
text
@@


1.1.2.1
log
@Got few more patches into -mm
@
text
@a0 105
kernel: change remaining uses of f_{dentry,vfsmnt} to use f_path

From: Josef "Jeff" Sipek <jsipek@@cs.sunysb.edu>

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

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

diff -r ed8030e0f7d4 kernel/auditsc.c
--- a/kernel/auditsc.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/kernel/auditsc.c	Mon Oct 23 23:27:19 2006 -0400
@@@@ -778,8 +778,8 @@@@ static void audit_log_task_info(struct a
 			if ((vma->vm_flags & VM_EXECUTABLE) &&
 			    vma->vm_file) {
 				audit_log_d_path(ab, "exe=",
-						 vma->vm_file->f_dentry,
-						 vma->vm_file->f_vfsmnt);
+						 vma->vm_file->f_path.dentry,
+						 vma->vm_file->f_path.mnt);
 				break;
 			}
 			vma = vma->vm_next;
diff -r ed8030e0f7d4 kernel/cpuset.c
--- a/kernel/cpuset.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/kernel/cpuset.c	Mon Oct 23 23:27:19 2006 -0400
@@@@ -413,8 +413,8 @@@@ static struct file_system_type cpuset_fs
  *
  *
  * When reading/writing to a file:
- *	- the cpuset to use in file->f_dentry->d_parent->d_fsdata
- *	- the 'cftype' of the file is file->f_dentry->d_fsdata
+ *	- the cpuset to use in file->f_path.dentry->d_parent->d_fsdata
+ *	- the 'cftype' of the file is file->f_path.dentry->d_fsdata
  */
 
 struct cftype {
@@@@ -1284,8 +1284,8 @@@@ static ssize_t cpuset_common_file_write(
 static ssize_t cpuset_common_file_write(struct file *file, const char __user *userbuf,
 					size_t nbytes, loff_t *unused_ppos)
 {
-	struct cpuset *cs = __d_cs(file->f_dentry->d_parent);
-	struct cftype *cft = __d_cft(file->f_dentry);
+	struct cpuset *cs = __d_cs(file->f_path.dentry->d_parent);
+	struct cftype *cft = __d_cft(file->f_path.dentry);
 	cpuset_filetype_t type = cft->private;
 	char *buffer;
 	char *pathbuf = NULL;
@@@@ -1367,7 +1367,7 @@@@ static ssize_t cpuset_file_write(struct 
 						size_t nbytes, loff_t *ppos)
 {
 	ssize_t retval = 0;
-	struct cftype *cft = __d_cft(file->f_dentry);
+	struct cftype *cft = __d_cft(file->f_path.dentry);
 	if (!cft)
 		return -ENODEV;
 
@@@@ -1417,8 +1417,8 @@@@ static ssize_t cpuset_common_file_read(s
 static ssize_t cpuset_common_file_read(struct file *file, char __user *buf,
 				size_t nbytes, loff_t *ppos)
 {
-	struct cftype *cft = __d_cft(file->f_dentry);
-	struct cpuset *cs = __d_cs(file->f_dentry->d_parent);
+	struct cftype *cft = __d_cft(file->f_path.dentry);
+	struct cpuset *cs = __d_cs(file->f_path.dentry->d_parent);
 	cpuset_filetype_t type = cft->private;
 	char *page;
 	ssize_t retval = 0;
@@@@ -1476,7 +1476,7 @@@@ static ssize_t cpuset_file_read(struct f
 								loff_t *ppos)
 {
 	ssize_t retval = 0;
-	struct cftype *cft = __d_cft(file->f_dentry);
+	struct cftype *cft = __d_cft(file->f_path.dentry);
 	if (!cft)
 		return -ENODEV;
 
@@@@ -1498,7 +1498,7 @@@@ static int cpuset_file_open(struct inode
 	if (err)
 		return err;
 
-	cft = __d_cft(file->f_dentry);
+	cft = __d_cft(file->f_path.dentry);
 	if (!cft)
 		return -ENODEV;
 	if (cft->open)
@@@@ -1511,7 +1511,7 @@@@ static int cpuset_file_open(struct inode
 
 static int cpuset_file_release(struct inode *inode, struct file *file)
 {
-	struct cftype *cft = __d_cft(file->f_dentry);
+	struct cftype *cft = __d_cft(file->f_path.dentry);
 	if (cft->release)
 		return cft->release(inode, file);
 	return 0;
@@@@ -1700,7 +1700,7 @@@@ static int pid_array_to_buf(char *buf, i
  */
 static int cpuset_tasks_open(struct inode *unused, struct file *file)
 {
-	struct cpuset *cs = __d_cs(file->f_dentry->d_parent);
+	struct cpuset *cs = __d_cs(file->f_path.dentry->d_parent);
 	struct ctr_struct *ctr;
 	pid_t *pidarray;
 	int npids;

@


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


