Deleted Added
full compact
union_vfsops.c (33964) union_vfsops.c (35256)
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 * $Id: union_vfsops.c,v 1.26 1998/02/10 08:04:31 kato Exp $
38 * $Id: union_vfsops.c,v 1.27 1998/03/01 22:46:25 msmith Exp $
39 */
40
41/*
42 * Union Layer
43 */
44
45#include <sys/param.h>
46#include <sys/systm.h>

--- 185 unchanged lines hidden (view full) ---

232 (um->um_lowervp->v_mount->mnt_flag & MNT_LOCAL)) &&
233 (um->um_uppervp->v_mount->mnt_flag & MNT_LOCAL))
234 mp->mnt_flag |= MNT_LOCAL;
235 }
236
237 /*
238 * Copy in the upper layer's RDONLY flag. This is for the benefit
239 * of lookup() which explicitly checks the flag, rather than asking
39 */
40
41/*
42 * Union Layer
43 */
44
45#include <sys/param.h>
46#include <sys/systm.h>

--- 185 unchanged lines hidden (view full) ---

232 (um->um_lowervp->v_mount->mnt_flag & MNT_LOCAL)) &&
233 (um->um_uppervp->v_mount->mnt_flag & MNT_LOCAL))
234 mp->mnt_flag |= MNT_LOCAL;
235 }
236
237 /*
238 * Copy in the upper layer's RDONLY flag. This is for the benefit
239 * of lookup() which explicitly checks the flag, rather than asking
240 * the filesystem for it's own opinion. This means, that an update
240 * the filesystem for its own opinion. This means, that an update
241 * mount of the underlying filesystem to go from rdonly to rdwr
242 * will leave the unioned view as read-only.
243 */
244 mp->mnt_flag |= (um->um_uppervp->v_mount->mnt_flag & MNT_RDONLY);
245
246 mp->mnt_data = (qaddr_t) um;
247 vfs_getnewfsid(mp);
248

--- 324 unchanged lines hidden ---
241 * mount of the underlying filesystem to go from rdonly to rdwr
242 * will leave the unioned view as read-only.
243 */
244 mp->mnt_flag |= (um->um_uppervp->v_mount->mnt_flag & MNT_RDONLY);
245
246 mp->mnt_data = (qaddr_t) um;
247 vfs_getnewfsid(mp);
248

--- 324 unchanged lines hidden ---