From: Steinar H. Gunderson Date: Mon, 10 Mar 2008 18:49:31 +0000 (-0400) Subject: The mount(5) man page states that the noquota, quota, usrquota and X-Git-Tag: nfs-utils-1-1-2~8 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=00511ee5c97793fa8bf3f463ac07cbb4029ca149;p=nfs-utils.git The mount(5) man page states that the noquota, quota, usrquota and grpquota options are ignored. (They are, however, used by the quota tools, so having them in fstab can be useful.) Make mount.nfs ignore them properly, matching the man page. There are a few aliases (like usrjquota) that are parsed by quota, but as these are not documented nor seem to be widely used, they are not included. Signed-off-by: Steinar H. Gunderson Signed-off-by: Steve Dickson --- diff --git a/utils/mount/mount.c b/utils/mount/mount.c index 403d6f4..839a329 100644 --- a/utils/mount/mount.c +++ b/utils/mount/mount.c @@ -136,6 +136,10 @@ static const struct opt_map opt_map[] = { { "norelatime", 0, 1, MS_RELATIME }, /* Update access time without regard to mtime/ctime */ #endif + { "noquota", 0, 0, MS_DUMMY }, /* Don't enforce quota */ + { "quota", 0, 0, MS_DUMMY }, /* Enforce user quota */ + { "usrquota", 0, 0, MS_DUMMY }, /* Enforce user quota */ + { "grpquota", 0, 0, MS_DUMMY }, /* Enforce group quota */ { NULL, 0, 0, 0 } };