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

Commit c941192a authored by Josef "Jeff" Sipek's avatar Josef "Jeff" Sipek Committed by Linus Torvalds
Browse files

[PATCH] x86_64: change uses of f_{dentry, vfsmnt} to use f_path 



Change all the uses of f_{dentry,vfsmnt} to f_path.{dentry,mnt} in the x86_64
arch code.

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

arch/x86_64/ia32/ia32_aout.c

+4 −4
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static int load_aout_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) ||

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

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

		return -ENOEXEC;

	}
@@ -357,7 +357,7 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs) 
		{

			printk(KERN_WARNING 

			       "fd_offset is not page aligned. Please convert program: %s\n",

			       bprm->file->f_dentry->d_name.name);

			       bprm->file->f_path.dentry->d_name.name);

			error_time = jiffies;

		}

#endif
@@ -440,7 +440,7 @@ static int load_aout_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));
@@ -471,7 +471,7 @@ static int load_aout_library(struct file *file) 
		{

			printk(KERN_WARNING 

			       "N_TXTOFF is not page aligned. Please convert library: %s\n",

			       file->f_dentry->d_name.name);

			       file->f_path.dentry->d_name.name);

			error_time = jiffies;

		}

#endif