| union_vfsops.c (85339) | union_vfsops.c (89306) |
|---|---|
| 1/* 2 * Copyright (c) 1994, 1995 The Regents of the University of California. 3 * Copyright (c) 1994, 1995 Jan-Simon Pendry. 4 * All rights reserved. 5 * 6 * This code is derived from software donated to Berkeley by 7 * Jan-Simon Pendry. 8 * --- 21 unchanged lines hidden (view full) --- 30 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 31 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 32 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 35 * SUCH DAMAGE. 36 * 37 * @(#)union_vfsops.c 8.20 (Berkeley) 5/20/95 | 1/* 2 * Copyright (c) 1994, 1995 The Regents of the University of California. 3 * Copyright (c) 1994, 1995 Jan-Simon Pendry. 4 * All rights reserved. 5 * 6 * This code is derived from software donated to Berkeley by 7 * Jan-Simon Pendry. 8 * --- 21 unchanged lines hidden (view full) --- 30 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 31 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 32 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 35 * SUCH DAMAGE. 36 * 37 * @(#)union_vfsops.c 8.20 (Berkeley) 5/20/95 |
| 38 * $FreeBSD: head/sys/fs/unionfs/union_vfsops.c 85339 2001-10-23 01:21:29Z dillon $ | 38 * $FreeBSD: head/sys/fs/unionfs/union_vfsops.c 89306 2002-01-13 11:58:06Z alfred $ |
| 39 */ 40 41/* 42 * Union Layer 43 */ 44 45#include <sys/param.h> 46#include <sys/systm.h> --- 172 unchanged lines hidden (view full) --- 219 */ 220 if ((mp->mnt_flag & MNT_RDONLY) == 0) { 221 error = VOP_WHITEOUT(um->um_uppervp, NULL, LOOKUP); 222 if (error) 223 goto bad; 224 } 225 226 um->um_cred = crhold(td->td_proc->p_ucred); | 39 */ 40 41/* 42 * Union Layer 43 */ 44 45#include <sys/param.h> 46#include <sys/systm.h> --- 172 unchanged lines hidden (view full) --- 219 */ 220 if ((mp->mnt_flag & MNT_RDONLY) == 0) { 221 error = VOP_WHITEOUT(um->um_uppervp, NULL, LOOKUP); 222 if (error) 223 goto bad; 224 } 225 226 um->um_cred = crhold(td->td_proc->p_ucred); |
| 227 FILEDESC_LOCK(td->td_proc->p_fd); |
|
| 227 um->um_cmode = UN_DIRMODE &~ td->td_proc->p_fd->fd_cmask; | 228 um->um_cmode = UN_DIRMODE &~ td->td_proc->p_fd->fd_cmask; |
| 229 FILEDESC_UNLOCK(td->td_proc->p_fd); |
|
| 228 229 /* 230 * Depending on what you think the MNT_LOCAL flag might mean, 231 * you may want the && to be || on the conditional below. 232 * At the moment it has been defined that the filesystem is 233 * only local if it is all local, ie the MNT_LOCAL flag implies 234 * that the entire namespace is local. If you think the MNT_LOCAL 235 * flag implies that some of the files might be stored locally --- 253 unchanged lines hidden --- | 230 231 /* 232 * Depending on what you think the MNT_LOCAL flag might mean, 233 * you may want the && to be || on the conditional below. 234 * At the moment it has been defined that the filesystem is 235 * only local if it is all local, ie the MNT_LOCAL flag implies 236 * that the entire namespace is local. If you think the MNT_LOCAL 237 * flag implies that some of the files might be stored locally --- 253 unchanged lines hidden --- |