Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c12ddba0 authored by Akinobu Mita's avatar Akinobu Mita Committed by Linus Torvalds
Browse files

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: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4dec302f

fs/hugetlbfs/inode.c

+1 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/pagevec.h>

#include <linux/parser.h>

#include <linux/mman.h>

#include <linux/quotaops.h>

#include <linux/slab.h>

#include <linux/dnotify.h>

#include <linux/statfs.h>
@@ -842,7 +841,7 @@ hugetlbfs_parse_options(char *options, struct hugetlbfs_config *pconfig) 
bad_val:

 	printk(KERN_ERR "hugetlbfs: Bad value '%s' for mount option '%s'\n",

	       args[0].from, p);

 	return 1;

 	return -EINVAL;

}



static int