summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/msr.c
diff options
context:
space:
mode:
authorAndre Richter2013-10-08 11:22:22 +0200
committerH. Peter Anvin2013-10-08 21:01:29 +0200
commit122498738417c73943b71294c60ec34fc110f5d6 (patch)
treeb158ef3e4af44dc28319afe1f46d422ad7a50ad9 /arch/x86/kernel/msr.c
parentx86: mkpiggy.c: Explicitly close the output file (diff)
downloadkernel-qcow2-linux-122498738417c73943b71294c60ec34fc110f5d6.tar.gz
kernel-qcow2-linux-122498738417c73943b71294c60ec34fc110f5d6.tar.xz
kernel-qcow2-linux-122498738417c73943b71294c60ec34fc110f5d6.zip
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@gmail.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@linux.intel.com>
Diffstat (limited to 'arch/x86/kernel/msr.c')
-rw-r--r--arch/x86/kernel/msr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
index 88458faea2f8..05266b5aae22 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) {