linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Josef "Jeff" Sipek <jsipek@cs.sunysb.edu>
To: linux-kernel@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org, akpm@osdl.org, torvalds@osdl.org,
	viro@ftp.linux.org.uk, hch@infradead.org, ak@suse.de
Subject: [PATCH 13 of 23] x86_64: change uses of f_{dentry, vfsmnt} to use f_path
Date: Sat, 21 Oct 2006 02:17:38 -0400	[thread overview]
Message-ID: <2d3d311922b0a50f919e.1161411458@thor.fsl.cs.sunysb.edu> (raw)
In-Reply-To: <patchbomb.1161411445@thor.fsl.cs.sunysb.edu>

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 x86_64 arch code.

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

---

1 file changed, 4 insertions(+), 4 deletions(-)
arch/x86_64/ia32/ia32_aout.c |    8 ++++----

diff --git a/arch/x86_64/ia32/ia32_aout.c b/arch/x86_64/ia32/ia32_aout.c
--- a/arch/x86_64/ia32/ia32_aout.c
+++ b/arch/x86_64/ia32/ia32_aout.c
@@ -272,7 +272,7 @@ static int load_aout_binary(struct linux
 	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
 		{
 			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
 	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
 		{
 			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

  parent reply	other threads:[~2006-10-21  6:17 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-10-21  6:17 [PATCH 00 of 23] struct file: Use struct path Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 01 of 23] VFS: change struct file to use " Josef Jeff Sipek
2006-10-21  7:22   ` Andrew Morton
2006-10-21  7:28     ` Josef Sipek
2006-10-23 11:47       ` Martin Waitz
2006-10-24  9:03         ` Josef Sipek
2006-10-21  6:17 ` [PATCH 02 of 23] sysfs: change uses of f_{dentry, vfsmnt} to use f_path Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 03 of 23] proc: " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 04 of 23] ext2: " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 05 of 23] ext3: " Josef Jeff Sipek
2006-10-21 12:51   ` Robert Peterson
2006-10-21 18:26     ` Josef Sipek
2006-10-21  6:17 ` [PATCH 06 of 23] ext4: " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 07 of 23] fat: change uses of f_{dentry,vfsmnt} " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 08 of 23] isofs: change uses of f_{dentry, vfsmnt} " Josef Jeff Sipek
2006-10-21 23:13   ` James Morris
2006-10-22  0:11     ` Linus Torvalds
2006-10-21  6:17 ` [PATCH 09 of 23] nfs: change uses of f_{dentry,vfsmnt} " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 10 of 23] nfsd: change uses of f_{dentry, vfsmnt} " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 11 of 23] ntfs: " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 12 of 23] i386: " Josef Jeff Sipek
2006-10-21  6:17 ` Josef Jeff Sipek [this message]
2006-10-21  6:17 ` [PATCH 14 of 23] kernel: " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 15 of 23] mm: change uses of f_{dentry,vfsmnt} " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 16 of 23] 9p: " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 17 of 23] affs: change uses of f_{dentry, vfsmnt} " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 18 of 23] autofs: " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 19 of 23] autofs4: " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 20 of 23] configfs: " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 21 of 23] cifs: " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 22 of 23] ecryptfs: " Josef Jeff Sipek
2006-10-21  6:17 ` [PATCH 23 of 23] xfs: change uses of f_{dentry,vfsmnt} " Josef Jeff Sipek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=2d3d311922b0a50f919e.1161411458@thor.fsl.cs.sunysb.edu \
    --to=jsipek@cs.sunysb.edu \
    --cc=ak@suse.de \
    --cc=akpm@osdl.org \
    --cc=hch@infradead.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@osdl.org \
    --cc=viro@ftp.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).