| ffs_vfsops.c (179269) | ffs_vfsops.c (179270) |
|---|---|
| 1/*- 2 * Copyright (c) 1989, 1991, 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 --- 16 unchanged lines hidden (view full) --- 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * SUCH DAMAGE. 28 * 29 * @(#)ffs_vfsops.c 8.31 (Berkeley) 5/20/95 30 */ 31 32#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1989, 1991, 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 --- 16 unchanged lines hidden (view full) --- 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * SUCH DAMAGE. 28 * 29 * @(#)ffs_vfsops.c 8.31 (Berkeley) 5/20/95 30 */ 31 32#include <sys/cdefs.h> |
| 33__FBSDID("$FreeBSD: head/sys/ufs/ffs/ffs_vfsops.c 179269 2008-05-24 00:02:12Z rodrigc $"); | 33__FBSDID("$FreeBSD: head/sys/ufs/ffs/ffs_vfsops.c 179270 2008-05-24 00:41:32Z rodrigc $"); |
| 34 35#include "opt_mac.h" 36#include "opt_quota.h" 37#include "opt_ufs.h" 38#include "opt_ffs.h" 39 40#include <sys/param.h> 41#include <sys/systm.h> --- 115 unchanged lines hidden (view full) --- 157 if (error) 158 return (error); 159 160 mntorflags = 0; 161 mntandnotflags = 0; 162 if (vfs_getopt(mp->mnt_optnew, "acls", NULL, NULL) == 0) 163 mntorflags |= MNT_ACLS; 164 | 34 35#include "opt_mac.h" 36#include "opt_quota.h" 37#include "opt_ufs.h" 38#include "opt_ffs.h" 39 40#include <sys/param.h> 41#include <sys/systm.h> --- 115 unchanged lines hidden (view full) --- 157 if (error) 158 return (error); 159 160 mntorflags = 0; 161 mntandnotflags = 0; 162 if (vfs_getopt(mp->mnt_optnew, "acls", NULL, NULL) == 0) 163 mntorflags |= MNT_ACLS; 164 |
| 165 if (vfs_getopt(mp->mnt_optnew, "snapshot", NULL, NULL) == 0) | 165 if (vfs_getopt(mp->mnt_optnew, "snapshot", NULL, NULL) == 0) { |
| 166 mntorflags |= MNT_SNAPSHOT; | 166 mntorflags |= MNT_SNAPSHOT; |
| 167 /* 168 * Once we have set the MNT_SNAPSHOT flag, do not 169 * persist "snapshot" in the options list. 170 */ 171 vfs_deleteopt(mp->mnt_optnew, "snapshot"); 172 vfs_deleteopt(mp->mnt_opt, "snapshot"); 173 } |
|
| 167 168 MNT_ILOCK(mp); 169 mp->mnt_flag = (mp->mnt_flag | mntorflags) & ~mntandnotflags; 170 MNT_IUNLOCK(mp); 171 /* 172 * If updating, check whether changing from read-only to 173 * read/write; if there is no device name, that's all we do. 174 */ --- 1671 unchanged lines hidden --- | 174 175 MNT_ILOCK(mp); 176 mp->mnt_flag = (mp->mnt_flag | mntorflags) & ~mntandnotflags; 177 MNT_IUNLOCK(mp); 178 /* 179 * If updating, check whether changing from read-only to 180 * read/write; if there is no device name, that's all we do. 181 */ --- 1671 unchanged lines hidden --- |