Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1250ca4c authored by Josef Sipek's avatar Josef Sipek Committed by Linus Torvalds
Browse files

[PATCH] struct path: convert sparc64 



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 45e07981

arch/sparc64/kernel/binfmt_aout32.c

+2 −2
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static int load_aout32_binary(struct linux_binprm * bprm, struct pt_regs * regs) 
	if ((N_MAGIC(ex) != ZMAGIC && N_MAGIC(ex) != OMAGIC &&

	     N_MAGIC(ex) != QMAGIC && N_MAGIC(ex) != NMAGIC) ||

	    N_TRSIZE(ex) || N_DRSIZE(ex) ||

	    bprm->file->f_dentry->d_inode->i_size < ex.a_text+ex.a_data+N_SYMSIZE(ex)+N_TXTOFF(ex)) {

	    bprm->file->f_path.dentry->d_inode->i_size < ex.a_text+ex.a_data+N_SYMSIZE(ex)+N_TXTOFF(ex)) {

		return -ENOEXEC;

	}
@@ -349,7 +349,7 @@ static int load_aout32_library(struct file *file) 
	int retval;

	struct exec ex;



	inode = file->f_dentry->d_inode;

	inode = file->f_path.dentry->d_inode;



	retval = -ENOEXEC;

	error = kernel_read(file, 0, (char *) &ex, sizeof(ex));

arch/sparc64/kernel/sys_sunos32.c

+2 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ asmlinkage u32 sunos_mmap(u32 addr, u32 len, u32 prot, u32 flags, u32 fd, u32 of 
 		file = fget(fd);

		if (!file)

			goto out;

		inode = file->f_dentry->d_inode;

		inode = file->f_path.dentry->d_inode;

		if (imajor(inode) == MEM_MAJOR && iminor(inode) == 5) {

			flags |= MAP_ANONYMOUS;

			fput(file);
@@ -615,7 +615,7 @@ sunos_nfs_get_server_fd (int fd, struct sockaddr_in *addr) 
	if (!file)

		return 0;



	inode = file->f_dentry->d_inode;

	inode = file->f_path.dentry->d_inode;



	socket = SOCKET_I(inode);

	local.sin_family = AF_INET;

arch/sparc64/solaris/fs.c

+2 −2
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ asmlinkage int solaris_fstatvfs(unsigned int fd, u32 buf) 
	error = -EBADF;

	file = fget(fd);

	if (file) {

		error = report_statvfs(file->f_vfsmnt, file->f_dentry->d_inode, buf);

		error = report_statvfs(file->f_path.mnt, file->f_path.dentry->d_inode, buf);

		fput(file);

	}
@@ -481,7 +481,7 @@ asmlinkage int solaris_fstatvfs64(unsigned int fd, u32 buf) 
	file = fget(fd);

	if (file) {

		lock_kernel();

		error = report_statvfs64(file->f_vfsmnt, file->f_dentry->d_inode, buf);

		error = report_statvfs64(file->f_path.mnt, file->f_path.dentry->d_inode, buf);

		unlock_kernel();

		fput(file);

	}

arch/sparc64/solaris/ioctl.c

+3 −3
Original line number Diff line number Diff line
@@ -299,8 +299,8 @@ static inline int solaris_sockmod(unsigned int fd, unsigned int cmd, u32 arg) 
	rcu_read_lock();

	fdt = files_fdtable(current->files);

	if (! fdt->fd[fd] ||

	    ! fdt->fd[fd]->f_dentry ||

	    ! (ino = fdt->fd[fd]->f_dentry->d_inode) ||

	    ! fdt->fd[fd]->f_path.dentry ||

	    ! (ino = fdt->fd[fd]->f_path.dentry->d_inode) ||

	    ! S_ISSOCK(ino->i_mode)) {

		rcu_read_unlock();

		return TBADF;
@@ -480,7 +480,7 @@ static inline int solaris_S(struct file *filp, unsigned int fd, unsigned int cmd 
        struct sol_socket_struct *sock;

        struct module_info *mi;



        ino = filp->f_dentry->d_inode;

        ino = filp->f_path.dentry->d_inode;

        if (!S_ISSOCK(ino->i_mode))

		return -EBADF;

        sock = filp->private_data;

arch/sparc64/solaris/misc.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static u32 do_solaris_mmap(u32 addr, u32 len, u32 prot, u32 flags, u32 fd, u64 o 
		if (!file)

			goto out;

		else {

			struct inode * inode = file->f_dentry->d_inode;

			struct inode * inode = file->f_path.dentry->d_inode;

			if(imajor(inode) == MEM_MAJOR &&

			   iminor(inode) == 5) {

				flags |= MAP_ANONYMOUS;