| vfs_mount.c (173064) | vfs_mount.c (174282) |
|---|---|
| 1/*- 2 * Copyright (c) 1999-2004 Poul-Henning Kamp 3 * Copyright (c) 1999 Michael Smith 4 * Copyright (c) 1989, 1993 5 * The Regents of the University of California. All rights reserved. 6 * (c) UNIX System Laboratories, Inc. 7 * All or some portions of this file are derived from material licensed 8 * to the University of California by American Telephone and Telegraph --- 21 unchanged lines hidden (view full) --- 30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 34 * SUCH DAMAGE. 35 */ 36 37#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1999-2004 Poul-Henning Kamp 3 * Copyright (c) 1999 Michael Smith 4 * Copyright (c) 1989, 1993 5 * The Regents of the University of California. All rights reserved. 6 * (c) UNIX System Laboratories, Inc. 7 * All or some portions of this file are derived from material licensed 8 * to the University of California by American Telephone and Telegraph --- 21 unchanged lines hidden (view full) --- 30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 34 * SUCH DAMAGE. 35 */ 36 37#include <sys/cdefs.h> |
| 38__FBSDID("$FreeBSD: head/sys/kern/vfs_mount.c 173064 2007-10-27 15:59:18Z rodrigc $"); | 38__FBSDID("$FreeBSD: head/sys/kern/vfs_mount.c 174282 2007-12-05 03:26:14Z rodrigc $"); |
| 39 40#include <sys/param.h> 41#include <sys/conf.h> 42#include <sys/clock.h> 43#include <sys/jail.h> 44#include <sys/kernel.h> 45#include <sys/libkern.h> 46#include <sys/malloc.h> --- 82 unchanged lines hidden (view full) --- 129 130/* 131 * Global opts, taken by all filesystems 132 */ 133static const char *global_opts[] = { 134 "errmsg", 135 "fstype", 136 "fspath", | 39 40#include <sys/param.h> 41#include <sys/conf.h> 42#include <sys/clock.h> 43#include <sys/jail.h> 44#include <sys/kernel.h> 45#include <sys/libkern.h> 46#include <sys/malloc.h> --- 82 unchanged lines hidden (view full) --- 129 130/* 131 * Global opts, taken by all filesystems 132 */ 133static const char *global_opts[] = { 134 "errmsg", 135 "fstype", 136 "fspath", |
| 137 "rdonly", | |
| 138 "ro", 139 "rw", 140 "nosuid", 141 "noexec", 142 "update", 143 NULL 144}; 145 --- 533 unchanged lines hidden (view full) --- 679 else if (strcmp(opt->name, "noro") == 0) { 680 fsflags &= ~MNT_RDONLY; 681 has_noro = 1; 682 } 683 else if (strcmp(opt->name, "rw") == 0) { 684 fsflags &= ~MNT_RDONLY; 685 has_rw = 1; 686 } | 137 "ro", 138 "rw", 139 "nosuid", 140 "noexec", 141 "update", 142 NULL 143}; 144 --- 533 unchanged lines hidden (view full) --- 678 else if (strcmp(opt->name, "noro") == 0) { 679 fsflags &= ~MNT_RDONLY; 680 has_noro = 1; 681 } 682 else if (strcmp(opt->name, "rw") == 0) { 683 fsflags &= ~MNT_RDONLY; 684 has_rw = 1; 685 } |
| 687 else if (strcmp(opt->name, "ro") == 0 || 688 strcmp(opt->name, "rdonly") == 0) | 686 else if (strcmp(opt->name, "ro") == 0) |
| 689 fsflags |= MNT_RDONLY; | 687 fsflags |= MNT_RDONLY; |
| 688 else if (strcmp(opt->name, "rdonly") == 0) { 689 free(opt->name, M_MOUNT); 690 opt->name = strdup("ro", M_MOUNT); 691 fsflags |= MNT_RDONLY; 692 } |
|
| 690 else if (strcmp(opt->name, "snapshot") == 0) 691 fsflags |= MNT_SNAPSHOT; 692 else if (strcmp(opt->name, "suiddir") == 0) 693 fsflags |= MNT_SUIDDIR; 694 else if (strcmp(opt->name, "sync") == 0) 695 fsflags |= MNT_SYNCHRONOUS; 696 else if (strcmp(opt->name, "union") == 0) 697 fsflags |= MNT_UNION; --- 1602 unchanged lines hidden --- | 693 else if (strcmp(opt->name, "snapshot") == 0) 694 fsflags |= MNT_SNAPSHOT; 695 else if (strcmp(opt->name, "suiddir") == 0) 696 fsflags |= MNT_SUIDDIR; 697 else if (strcmp(opt->name, "sync") == 0) 698 fsflags |= MNT_SYNCHRONOUS; 699 else if (strcmp(opt->name, "union") == 0) 700 fsflags |= MNT_UNION; --- 1602 unchanged lines hidden --- |