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
Subject: [PATCH 12 of 23] i386: change uses of f_{dentry, vfsmnt} to use f_path
Date: Sat, 21 Oct 2006 02:17:37 -0400 [thread overview]
Message-ID: <80b5ca3e42d1fb3ea5bb.1161411457@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 i386 arch code.
Signed-off-by: Josef "Jeff" Sipek <jsipek@cs.sunysb.edu>
---
2 files changed, 5 insertions(+), 5 deletions(-)
arch/i386/kernel/cpuid.c | 4 ++--
arch/i386/kernel/msr.c | 6 +++---
diff --git a/arch/i386/kernel/cpuid.c b/arch/i386/kernel/cpuid.c
--- a/arch/i386/kernel/cpuid.c
+++ b/arch/i386/kernel/cpuid.c
@@ -117,7 +117,7 @@ static ssize_t cpuid_read(struct file *f
char __user *tmp = buf;
u32 data[4];
u32 reg = *ppos;
- int cpu = iminor(file->f_dentry->d_inode);
+ int cpu = iminor(file->f_path.dentry->d_inode);
if (count % 16)
return -EINVAL; /* Invalid chunk size */
@@ -135,7 +135,7 @@ static ssize_t cpuid_read(struct file *f
static int cpuid_open(struct inode *inode, struct file *file)
{
- unsigned int cpu = iminor(file->f_dentry->d_inode);
+ unsigned int cpu = iminor(file->f_path.dentry->d_inode);
struct cpuinfo_x86 *c = &(cpu_data)[cpu];
if (cpu >= NR_CPUS || !cpu_online(cpu))
diff --git a/arch/i386/kernel/msr.c b/arch/i386/kernel/msr.c
--- a/arch/i386/kernel/msr.c
+++ b/arch/i386/kernel/msr.c
@@ -172,7 +172,7 @@ static ssize_t msr_read(struct file *fil
u32 __user *tmp = (u32 __user *) buf;
u32 data[2];
u32 reg = *ppos;
- int cpu = iminor(file->f_dentry->d_inode);
+ int cpu = iminor(file->f_path.dentry->d_inode);
int err;
if (count % 8)
@@ -197,7 +197,7 @@ static ssize_t msr_write(struct file *fi
u32 data[2];
size_t rv;
u32 reg = *ppos;
- int cpu = iminor(file->f_dentry->d_inode);
+ int cpu = iminor(file->f_path.dentry->d_inode);
int err;
if (count % 8)
@@ -217,7 +217,7 @@ static ssize_t msr_write(struct file *fi
static int msr_open(struct inode *inode, struct file *file)
{
- unsigned int cpu = iminor(file->f_dentry->d_inode);
+ unsigned int cpu = iminor(file->f_path.dentry->d_inode);
struct cpuinfo_x86 *c = &(cpu_data)[cpu];
if (cpu >= NR_CPUS || !cpu_online(cpu))
next prev parent reply other threads:[~2006-10-21 7:13 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 ` Josef Jeff Sipek [this message]
2006-10-21 6:17 ` [PATCH 13 of 23] x86_64: " Josef Jeff Sipek
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=80b5ca3e42d1fb3ea5bb.1161411457@thor.fsl.cs.sunysb.edu \
--to=jsipek@cs.sunysb.edu \
--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
all inboxes | Powered by JetHome®