lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Browse Source 
Pull x86 cleanups from Ingo Molnar:
 "Two small cleanups"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, msr: Use file_inode(), not f_mapping->host
  x86: mkpiggy.c: Explicitly close the output file
This commit is contained in:
Linus Torvalds
2013-11-12 10:45:01 +09:00
parent 54e11304e8 1224987384
commit d96d8aa261
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
arch/x86/boot/compressed/mkpiggy.c
View File

@@ -36,11 +36,12 @@ int main(int argc, char *argv[])
uint32_t olen; uint32_t olen;
long ilen; long ilen;
unsigned long offs; unsigned long offs;
FILE *f; FILE *f = NULL;
int retval = 1;
if (argc < 2) { if (argc < 2) {
fprintf(stderr, "Usage: %s compressed_file\n", argv[0]); fprintf(stderr, "Usage: %s compressed_file\n", argv[0]);
return 1; goto bail;
} }
/* Get the information for the compressed kernel image first */ /* Get the information for the compressed kernel image first */
@@ -48,7 +49,7 @@ int main(int argc, char *argv[])
f = fopen(argv[1], "r"); f = fopen(argv[1], "r");
if (!f) { if (!f) {
perror(argv[1]); perror(argv[1]);
return 1; goto bail;
} }
@@ -58,12 +59,11 @@ int main(int argc, char *argv[])
if (fread(&olen, sizeof(olen), 1, f) != 1) { if (fread(&olen, sizeof(olen), 1, f) != 1) {
perror(argv[1]); perror(argv[1]);
return 1; goto bail;
} }
ilen = ftell(f); ilen = ftell(f);
olen = get_unaligned_le32(&olen); olen = get_unaligned_le32(&olen);
fclose(f);
/* /*
* Now we have the input (compressed) and output (uncompressed) * Now we have the input (compressed) and output (uncompressed)
@@ -91,5 +91,9 @@ int main(int argc, char *argv[])
printf(".incbin \"%s\"\n", argv[1]); printf(".incbin \"%s\"\n", argv[1]);
printf("input_data_end:\n"); printf("input_data_end:\n");
return 0; retval = 0;
bail:
if (f)
fclose(f);
return retval;
} }

2
arch/x86/kernel/msr.c
View File

@@ -46,7 +46,7 @@ static struct class *msr_class;
static loff_t msr_seek(struct file *file, loff_t offset, int orig) static loff_t msr_seek(struct file *file, loff_t offset, int orig)
{ {
loff_t ret; loff_t ret;
struct inode *inode = file->f_mapping->host; struct inode *inode = file_inode(file);
mutex_lock(&inode->i_mutex); mutex_lock(&inode->i_mutex);
switch (orig) { switch (orig) {