Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit c12ddba09394c60e1120e6997794fa6ed52da884

Authored by Akinobu Mita
Committed by Linus Torvalds
1 parent 4dec302ff7
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

hugetlbfs: return negative error code for bad mount option 

This fixes the following BUG:

  # mount -o size=MM -t hugetlbfs none /huge
  hugetlbfs: Bad value 'MM' for mount option 'size=MM'
  ------------[ cut here ]------------
  kernel BUG at fs/super.c:996!

Due to

	BUG_ON(!mnt->mnt_sb);

in vfs_kern_mount().

Also, remove unused #include <linux/quotaops.h>

Cc: William Irwin <wli@holomorphy.com>
Cc: <stable@kernel.org>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 1 additions and 2 deletions Side-by-side Diff

fs/hugetlbfs/inode.c
Diff comments   View file @ c12ddba
... ... @@ -26,7 +26,6 @@
26 26 #include <linux/pagevec.h>
27 27 #include <linux/parser.h>
28 28 #include <linux/mman.h>
29   -#include <linux/quotaops.h>
30 29 #include <linux/slab.h>
31 30 #include <linux/dnotify.h>
32 31 #include <linux/statfs.h>
... ... @@ -842,7 +841,7 @@
842 841 bad_val:
843 842 printk(KERN_ERR "hugetlbfs: Bad value '%s' for mount option '%s'\n",
844 843 args[0].from, p);
845   - return 1;
  844 + return -EINVAL;
846 845 }
847 846  
848 847 static int