From 35d6c7f50eb29819dd267810b3a41659326dc4a5 Mon Sep 17 00:00:00 2001
From: Craig Rodrigues <rodrigc@FreeBSD.org>
Date: Wed, 23 Nov 2005 20:17:27 +0000
Subject: [PATCH] Do not pass userquota and groupquota mount options to
 nmount(). These options are read from fstab by quotacheck(8), but are not
 valid mount options that need to be passed down the the filesystem.

Noticed by:	maxim
---
 sbin/mount/mount.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index 89bc1cbda1d7..abde12d27bc0 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -633,6 +633,10 @@ mangle(options, argcp, argv)
 				 * not a real mount option.
 				 */
 				continue;
+			} else if (strcmp(p, "userquota") == 0) {
+				continue;
+			} else if (strcmp(p, "groupquota") == 0) {
+				continue;
 			} else if (*p == '-') {
 				argv[argc++] = p;
 				p = strchr(p, '=');