| union_vfsops.c (177785) | union_vfsops.c (182371) |
|---|---|
| 1/*- 2 * Copyright (c) 1994, 1995 The Regents of the University of California. 3 * Copyright (c) 1994, 1995 Jan-Simon Pendry. 4 * Copyright (c) 2005, 2006 Masanori Ozawa <ozawa@ongs.co.jp>, ONGS Inc. 5 * Copyright (c) 2006 Daichi Goto <daichi@freebsd.org> 6 * All rights reserved. 7 * 8 * This code is derived from software donated to Berkeley by --- 19 unchanged lines hidden (view full) --- 28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 33 * SUCH DAMAGE. 34 * 35 * @(#)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 * Copyright (c) 2005, 2006 Masanori Ozawa <ozawa@ongs.co.jp>, ONGS Inc. 5 * Copyright (c) 2006 Daichi Goto <daichi@freebsd.org> 6 * All rights reserved. 7 * 8 * This code is derived from software donated to Berkeley by --- 19 unchanged lines hidden (view full) --- 28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 33 * SUCH DAMAGE. 34 * 35 * @(#)union_vfsops.c 8.20 (Berkeley) 5/20/95 |
| 36 * $FreeBSD: head/sys/fs/unionfs/union_vfsops.c 177785 2008-03-31 12:01:21Z kib $ | 36 * $FreeBSD: head/sys/fs/unionfs/union_vfsops.c 182371 2008-08-28 15:23:18Z attilio $ |
| 37 */ 38 39#include <sys/param.h> 40#include <sys/systm.h> 41#include <sys/kdb.h> 42#include <sys/fcntl.h> 43#include <sys/kernel.h> 44#include <sys/lock.h> --- 142 unchanged lines hidden (view full) --- 187 } 188 /* check umask, uid and gid */ 189 if (udir == 0 && ufile != 0) 190 udir = ufile; 191 if (ufile == 0 && udir != 0) 192 ufile = udir; 193 194 vn_lock(mp->mnt_vnodecovered, LK_SHARED | LK_RETRY); | 37 */ 38 39#include <sys/param.h> 40#include <sys/systm.h> 41#include <sys/kdb.h> 42#include <sys/fcntl.h> 43#include <sys/kernel.h> 44#include <sys/lock.h> --- 142 unchanged lines hidden (view full) --- 187 } 188 /* check umask, uid and gid */ 189 if (udir == 0 && ufile != 0) 190 udir = ufile; 191 if (ufile == 0 && udir != 0) 192 ufile = udir; 193 194 vn_lock(mp->mnt_vnodecovered, LK_SHARED | LK_RETRY); |
| 195 error = VOP_GETATTR(mp->mnt_vnodecovered, &va, mp->mnt_cred, td); | 195 error = VOP_GETATTR(mp->mnt_vnodecovered, &va, mp->mnt_cred); |
| 196 if (!error) { 197 if (udir == 0) 198 udir = va.va_mode; 199 if (ufile == 0) 200 ufile = va.va_mode; 201 uid = va.va_uid; 202 gid = va.va_gid; 203 } --- 360 unchanged lines hidden --- | 196 if (!error) { 197 if (udir == 0) 198 udir = va.va_mode; 199 if (ufile == 0) 200 ufile = va.va_mode; 201 uid = va.va_uid; 202 gid = va.va_gid; 203 } --- 360 unchanged lines hidden --- |