[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-122498738417c73943b71294c60ec34fc110f5d6@git.kernel.org>
Date: Tue, 8 Oct 2013 12:03:43 -0700
From: tip-bot for Andre Richter <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
tglx@...utronix.de, hpa@...ux.intel.com, andre.o.richter@...il.com
Subject: [tip:x86/cleanups] x86, msr: Use file_inode(), not f_mapping->
host
Commit-ID: 122498738417c73943b71294c60ec34fc110f5d6
Gitweb: http://git.kernel.org/tip/122498738417c73943b71294c60ec34fc110f5d6
Author: Andre Richter <andre.o.richter@...il.com>
AuthorDate: Tue, 8 Oct 2013 11:22:22 +0200
Committer: H. Peter Anvin <hpa@...ux.intel.com>
CommitDate: Tue, 8 Oct 2013 12:01:29 -0700
x86, msr: Use file_inode(), not f_mapping->host
As discussed in [1], exchange f_mapping->host with file_inode(). This
is a bug, but happens to be non-manifest in this case.
[1] http://lkml.kernel.org/r/20131007190357.GA13318@ZenIV.linux.org.uk
Signed-off-by: Andre Richter <andre.o.richter@...il.com>
Link: http://lkml.kernel.org/r/1381224142-3267-1-git-send-email-andre.o.richter@gmail.com
Signed-off-by: H. Peter Anvin <hpa@...ux.intel.com>
---
arch/x86/kernel/msr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
index 88458fa..05266b5 100644
--- a/arch/x86/kernel/msr.c
+++ b/arch/x86/kernel/msr.c
@@ -46,7 +46,7 @@ static struct class *msr_class;
static loff_t msr_seek(struct file *file, loff_t offset, int orig)
{
loff_t ret;
- struct inode *inode = file->f_mapping->host;
+ struct inode *inode = file_inode(file);
mutex_lock(&inode->i_mutex);
switch (orig) {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists