| mount.c (197200) | mount.c (200796) |
|---|---|
| 1/*- 2 * Copyright (c) 1980, 1989, 1993, 1994 3 * The Regents of the University of California. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 23 unchanged lines hidden (view full) --- 32"@(#) Copyright (c) 1980, 1989, 1993, 1994\n\ 33 The Regents of the University of California. All rights reserved.\n"; 34#if 0 35static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95"; 36#endif 37#endif /* not lint */ 38 39#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1980, 1989, 1993, 1994 3 * The Regents of the University of California. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 23 unchanged lines hidden (view full) --- 32"@(#) Copyright (c) 1980, 1989, 1993, 1994\n\ 33 The Regents of the University of California. All rights reserved.\n"; 34#if 0 35static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95"; 36#endif 37#endif /* not lint */ 38 39#include <sys/cdefs.h> |
| 40__FBSDID("$FreeBSD: head/sbin/mount/mount.c 197200 2009-09-14 21:08:22Z pjd $"); | 40__FBSDID("$FreeBSD: head/sbin/mount/mount.c 200796 2009-12-21 19:39:10Z trasz $"); |
| 41 42#include <sys/param.h> 43#include <sys/mount.h> 44#include <sys/stat.h> 45#include <sys/wait.h> 46 47#include <ctype.h> 48#include <err.h> --- 57 unchanged lines hidden (view full) --- 106 { MNT_SYNCHRONOUS, "synchronous" }, 107 { MNT_UNION, "union" }, 108 { MNT_NOCLUSTERR, "noclusterr" }, 109 { MNT_NOCLUSTERW, "noclusterw" }, 110 { MNT_SUIDDIR, "suiddir" }, 111 { MNT_SOFTDEP, "soft-updates" }, 112 { MNT_MULTILABEL, "multilabel" }, 113 { MNT_ACLS, "acls" }, | 41 42#include <sys/param.h> 43#include <sys/mount.h> 44#include <sys/stat.h> 45#include <sys/wait.h> 46 47#include <ctype.h> 48#include <err.h> --- 57 unchanged lines hidden (view full) --- 106 { MNT_SYNCHRONOUS, "synchronous" }, 107 { MNT_UNION, "union" }, 108 { MNT_NOCLUSTERR, "noclusterr" }, 109 { MNT_NOCLUSTERW, "noclusterw" }, 110 { MNT_SUIDDIR, "suiddir" }, 111 { MNT_SOFTDEP, "soft-updates" }, 112 { MNT_MULTILABEL, "multilabel" }, 113 { MNT_ACLS, "acls" }, |
| 114 { MNT_NFS4ACLS, "nfsv4acls" }, |
|
| 114 { MNT_GJOURNAL, "gjournal" }, 115 { 0, NULL } 116}; 117 118/* 119 * List of VFS types that can be remounted without becoming mounted on top 120 * of each other. 121 * XXX Is this list correct? --- 791 unchanged lines hidden (view full) --- 913 if (flags & MNT_ASYNC) res = catopt(res, "async"); 914 if (flags & MNT_NOATIME) res = catopt(res, "noatime"); 915 if (flags & MNT_NOCLUSTERR) res = catopt(res, "noclusterr"); 916 if (flags & MNT_NOCLUSTERW) res = catopt(res, "noclusterw"); 917 if (flags & MNT_NOSYMFOLLOW) res = catopt(res, "nosymfollow"); 918 if (flags & MNT_SUIDDIR) res = catopt(res, "suiddir"); 919 if (flags & MNT_MULTILABEL) res = catopt(res, "multilabel"); 920 if (flags & MNT_ACLS) res = catopt(res, "acls"); | 115 { MNT_GJOURNAL, "gjournal" }, 116 { 0, NULL } 117}; 118 119/* 120 * List of VFS types that can be remounted without becoming mounted on top 121 * of each other. 122 * XXX Is this list correct? --- 791 unchanged lines hidden (view full) --- 914 if (flags & MNT_ASYNC) res = catopt(res, "async"); 915 if (flags & MNT_NOATIME) res = catopt(res, "noatime"); 916 if (flags & MNT_NOCLUSTERR) res = catopt(res, "noclusterr"); 917 if (flags & MNT_NOCLUSTERW) res = catopt(res, "noclusterw"); 918 if (flags & MNT_NOSYMFOLLOW) res = catopt(res, "nosymfollow"); 919 if (flags & MNT_SUIDDIR) res = catopt(res, "suiddir"); 920 if (flags & MNT_MULTILABEL) res = catopt(res, "multilabel"); 921 if (flags & MNT_ACLS) res = catopt(res, "acls"); |
| 922 if (flags & MNT_NFS4ACLS) res = catopt(res, "nfsv4acls"); |
|
| 921 922 return (res); 923} | 923 924 return (res); 925} |