d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r208293: ffs_mount: accept and drop userland-only options that can

Browse Source 
be passed from loader(8)

PR:		kern/141050
This commit is contained in:
Andriy Gapon 2010-05-23 07:21:50 +00:00
parent 57da3de368
commit 710b73c893
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/stable/8/; revision=208435
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/ufs/ffs/ffs_vfsops.c
View File

@ -125,10 +125,16 @@ static struct buf_ops ffs_ops = {
#endif
};
/*
* Note that userquota and groupquota options are not currently used
* by UFS/FFS code and generally mount(8) does not pass those options
* from userland, but they can be passed by loader(8) via
* vfs.root.mountfrom.options.
*/
static const char *ffs_opts[] = { "acls", "async", "noatime", "noclusterr",
"noclusterw", "noexec", "export", "force", "from", "multilabel",
"nfsv4acls", "snapshot", "nosuid", "suiddir", "nosymfollow", "sync",
"union", NULL };
"noclusterw", "noexec", "export", "force", "from", "groupquota",
"multilabel", "nfsv4acls", "snapshot", "nosuid", "suiddir", "nosymfollow",
"sync", "union", "userquota", NULL };
static int
ffs_mount(struct mount *mp)
@ -158,6 +164,9 @@ ffs_mount(struct mount *mp)
UMA_ALIGN_PTR, 0);
}
vfs_deleteopt(mp->mnt_optnew, "groupquota");
vfs_deleteopt(mp->mnt_optnew, "userquota");
fspec = vfs_getopts(mp->mnt_optnew, "from", &error);
if (error)
return (error);