mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	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>
This commit is contained in:
		
							parent
							
								
									4dec302ff7
								
							
						
					
					
						commit
						c12ddba093
					
				
					 1 changed files with 1 additions and 2 deletions
				
			
		| 
						 | 
					@ -26,7 +26,6 @@
 | 
				
			||||||
#include <linux/pagevec.h>
 | 
					#include <linux/pagevec.h>
 | 
				
			||||||
#include <linux/parser.h>
 | 
					#include <linux/parser.h>
 | 
				
			||||||
#include <linux/mman.h>
 | 
					#include <linux/mman.h>
 | 
				
			||||||
#include <linux/quotaops.h>
 | 
					 | 
				
			||||||
#include <linux/slab.h>
 | 
					#include <linux/slab.h>
 | 
				
			||||||
#include <linux/dnotify.h>
 | 
					#include <linux/dnotify.h>
 | 
				
			||||||
#include <linux/statfs.h>
 | 
					#include <linux/statfs.h>
 | 
				
			||||||
| 
						 | 
					@ -842,7 +841,7 @@ hugetlbfs_parse_options(char *options, struct hugetlbfs_config *pconfig)
 | 
				
			||||||
bad_val:
 | 
					bad_val:
 | 
				
			||||||
 	printk(KERN_ERR "hugetlbfs: Bad value '%s' for mount option '%s'\n",
 | 
					 	printk(KERN_ERR "hugetlbfs: Bad value '%s' for mount option '%s'\n",
 | 
				
			||||||
	       args[0].from, p);
 | 
						       args[0].from, p);
 | 
				
			||||||
 	return 1;
 | 
					 	return -EINVAL;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int
 | 
					static int
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue