| From 5a9b5af39e948919f272867516faa61c093124f6 Mon Sep 17 00:00:00 2001 |
| From: Akinobu Mita <akinobu.mita@gmail.com> |
| Date: Tue, 21 Apr 2009 21:20:04 +0000 |
| Subject: hugetlbfs: return negative error code for bad mount option |
| |
| From: Akinobu Mita <akinobu.mita@gmail.com> |
| |
| upstream commit: c12ddba09394c60e1120e6997794fa6ed52da884 |
| |
| 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> |
| 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> |
| Signed-off-by: Chris Wright <chrisw@sous-sol.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| --- |
| fs/hugetlbfs/inode.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| --- a/fs/hugetlbfs/inode.c |
| +++ b/fs/hugetlbfs/inode.c |
| @@ -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> |
| @@ -838,7 +837,7 @@ hugetlbfs_parse_options(char *options, s |
| bad_val: |
| printk(KERN_ERR "hugetlbfs: Bad value '%s' for mount option '%s'\n", |
| args[0].from, p); |
| - return 1; |
| + return -EINVAL; |
| } |
| |
| static int |
