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 mips was initially added on branch LKML-branch.
@
text
@@


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

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

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

Cc: ralf@@linux-mips.org
Signed-off-by: Josef "Jeff" Sipek <jsipek@@cs.sunysb.edu>

diff -r ed8030e0f7d4 arch/mips/kernel/rtlx.c
--- a/arch/mips/kernel/rtlx.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/arch/mips/kernel/rtlx.c	Mon Oct 23 23:25:18 2006 -0400
@@@@ -415,7 +415,7 @@@@ static unsigned int file_poll(struct fil
 	int minor;
 	unsigned int mask = 0;
 
-	minor = iminor(file->f_dentry->d_inode);
+	minor = iminor(file->f_path.dentry->d_inode);
 
 	poll_wait(file, &channel_wqs[minor].rt_queue, wait);
 	poll_wait(file, &channel_wqs[minor].lx_queue, wait);
@@@@ -437,7 +437,7 @@@@ static ssize_t file_read(struct file *fi
 static ssize_t file_read(struct file *file, char __user * buffer, size_t count,
 			 loff_t * ppos)
 {
-	int minor = iminor(file->f_dentry->d_inode);
+	int minor = iminor(file->f_path.dentry->d_inode);
 
 	/* data available? */
 	if (!rtlx_read_poll(minor, (file->f_flags & O_NONBLOCK) ? 0 : 1)) {
@@@@ -454,7 +454,7 @@@@ static ssize_t file_write(struct file *f
 	struct rtlx_channel *rt;
 	DECLARE_WAITQUEUE(wait, current);
 
-	minor = iminor(file->f_dentry->d_inode);
+	minor = iminor(file->f_path.dentry->d_inode);
 	rt = &rtlx->channel[minor];
 
 	/* any space left... */
diff -r ed8030e0f7d4 arch/mips/kernel/sysirix.c
--- a/arch/mips/kernel/sysirix.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/arch/mips/kernel/sysirix.c	Mon Oct 23 23:25:18 2006 -0400
@@@@ -732,7 +732,7 @@@@ asmlinkage int irix_fstatfs(unsigned int
 		goto out;
 	}
 
-	error = vfs_statfs(file->f_dentry, &kbuf);
+	error = vfs_statfs(file->f_path.dentry, &kbuf);
 	if (error)
 		goto out_f;
 
@@@@ -1041,7 +1041,7 @@@@ asmlinkage unsigned long irix_mmap32(uns
 			unsigned long old_pos;
 			long max_size = offset + len;
 
-			if (max_size > file->f_dentry->d_inode->i_size) {
+			if (max_size > file->f_path.dentry->d_inode->i_size) {
 				old_pos = sys_lseek (fd, max_size - 1, 0);
 				sys_write (fd, (void __user *) "", 1);
 				sys_lseek (fd, old_pos, 0);
@@@@ -1406,7 +1406,7 @@@@ asmlinkage int irix_fstatvfs(int fd, str
 		error = -EBADF;
 		goto out;
 	}
-	error = vfs_statfs(file->f_dentry, &kbuf);
+	error = vfs_statfs(file->f_path.dentry, &kbuf);
 	if (error)
 		goto out_f;
 
@@@@ -1526,7 +1526,7 @@@@ asmlinkage int irix_mmap64(struct pt_reg
 			unsigned long old_pos;
 			long max_size = off2 + len;
 
-			if (max_size > file->f_dentry->d_inode->i_size) {
+			if (max_size > file->f_path.dentry->d_inode->i_size) {
 				old_pos = sys_lseek (fd, max_size - 1, 0);
 				sys_write (fd, (void __user *) "", 1);
 				sys_lseek (fd, old_pos, 0);
@@@@ -1658,7 +1658,7 @@@@ asmlinkage int irix_fstatvfs64(int fd, s
 		error = -EBADF;
 		goto out;
 	}
-	error = vfs_statfs(file->f_dentry, &kbuf);
+	error = vfs_statfs(file->f_path.dentry, &kbuf);
 	if (error)
 		goto out_f;
 
diff -r ed8030e0f7d4 arch/mips/kernel/vpe.c
--- a/arch/mips/kernel/vpe.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/arch/mips/kernel/vpe.c	Mon Oct 23 23:25:18 2006 -0400
@@@@ -1179,7 +1179,7 @@@@ static ssize_t vpe_write(struct file *fi
 	size_t ret = count;
 	struct vpe *v;
 
-	minor = iminor(file->f_dentry->d_inode);
+	minor = iminor(file->f_path.dentry->d_inode);
 	if ((v = get_vpe(minor)) == NULL)
 		return -ENODEV;
 
diff -r ed8030e0f7d4 arch/mips/lasat/sysctl.c
--- a/arch/mips/lasat/sysctl.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/arch/mips/lasat/sysctl.c	Mon Oct 23 23:25:18 2006 -0400
@@@@ -286,11 +286,11 @@@@ int proc_lasat_eeprom_value(ctl_table *t
 		mutex_unlock(&lasat_info_mutex);
 		return r;
 	}
-	if (filp && filp->f_dentry)
+	if (filp && filp->f_path.dentry)
 	{
-		if (!strcmp(filp->f_dentry->d_name.name, "prid"))
+		if (!strcmp(filp->f_path.dentry->d_name.name, "prid"))
 			lasat_board_info.li_eeprom_info.prid = lasat_board_info.li_prid;
-		if (!strcmp(filp->f_dentry->d_name.name, "debugaccess"))
+		if (!strcmp(filp->f_path.dentry->d_name.name, "debugaccess"))
 			lasat_board_info.li_eeprom_info.debugaccess = lasat_board_info.li_debugaccess;
 	}
 	lasat_write_eeprom_info();

@


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


