Commit 1b04fe9a authored by Josef Sipek's avatar Josef Sipek Committed by Linus Torvalds
Browse files

[PATCH] struct path: convert mips 



Signed-off-by: default avatarJosef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent dcf258ae

arch/mips/kernel/rtlx.c

+3 −3
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ static unsigned int file_poll(struct file *file, poll_table * wait) 
	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 unsigned int file_poll(struct file *file, poll_table * wait) 
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 *file, const char __user * buffer, 
	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... */

arch/mips/kernel/sysirix.c

+5 −5
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ asmlinkage int irix_fstatfs(unsigned int fd, struct irix_statfs __user *buf) 
		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(unsigned long addr, size_t len, int prot, 
			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, struct irix_statvfs __user *buf) 
		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_regs *regs) 
			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, struct irix_statvfs __user *buf) 
		error = -EBADF;

		goto out;

	}

	error = vfs_statfs(file->f_dentry, &kbuf);

	error = vfs_statfs(file->f_path.dentry, &kbuf);

	if (error)

		goto out_f;

arch/mips/kernel/vpe.c

+1 −1
Original line number Diff line number Diff line
@@ -1179,7 +1179,7 @@ static ssize_t vpe_write(struct file *file, const char __user * buffer, 
	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;

arch/mips/lasat/sysctl.c

+3 −3
Original line number Diff line number Diff line
@@ -286,11 +286,11 @@ int proc_lasat_eeprom_value(ctl_table *table, int write, struct file *filp, 
		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();