Deleted Added
full compact
cd9660_vfsops.c (106355) cd9660_vfsops.c (109623)
1/*-
2 * Copyright (c) 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley
6 * by Pace Willisson (pace@blitz.com). The Rock Ridge Extension
7 * Support code is derived from software contributed to Berkeley
8 * by Atsushi Murai (amurai@spec.co.jp).

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

31 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
32 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
36 * SUCH DAMAGE.
37 *
38 * @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95
1/*-
2 * Copyright (c) 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley
6 * by Pace Willisson (pace@blitz.com). The Rock Ridge Extension
7 * Support code is derived from software contributed to Berkeley
8 * by Atsushi Murai (amurai@spec.co.jp).

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

31 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
32 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
36 * SUCH DAMAGE.
37 *
38 * @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95
39 * $FreeBSD: head/sys/fs/cd9660/cd9660_vfsops.c 106355 2002-11-02 20:16:55Z peter $
39 * $FreeBSD: head/sys/fs/cd9660/cd9660_vfsops.c 109623 2003-01-21 08:56:16Z alfred $
40 */
41
42#include <sys/param.h>
43#include <sys/systm.h>
44#include <sys/namei.h>
45#include <sys/proc.h>
46#include <sys/kernel.h>
47#include <sys/vnode.h>

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

406 goto out;
407 }
408
409 rootp = (struct iso_directory_record *)
410 (high_sierra?
411 pri_sierra->root_directory_record:
412 pri->root_directory_record);
413
40 */
41
42#include <sys/param.h>
43#include <sys/systm.h>
44#include <sys/namei.h>
45#include <sys/proc.h>
46#include <sys/kernel.h>
47#include <sys/vnode.h>

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

406 goto out;
407 }
408
409 rootp = (struct iso_directory_record *)
410 (high_sierra?
411 pri_sierra->root_directory_record:
412 pri->root_directory_record);
413
414 isomp = malloc(sizeof *isomp, M_ISOFSMNT, M_WAITOK | M_ZERO);
414 isomp = malloc(sizeof *isomp, M_ISOFSMNT, M_ZERO);
415 isomp->logical_block_size = logical_block_size;
416 isomp->volume_space_size =
417 isonum_733 (high_sierra?
418 pri_sierra->volume_space_size:
419 pri->volume_space_size);
420 isomp->joliet_level = 0;
421 /*
422 * Since an ISO9660 multi-session CD can also access previous

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

707 return (0);
708
709 /* Allocate a new vnode/iso_node. */
710 if ((error = getnewvnode("isofs", mp, cd9660_vnodeop_p, &vp)) != 0) {
711 *vpp = NULLVP;
712 return (error);
713 }
714 MALLOC(ip, struct iso_node *, sizeof(struct iso_node), M_ISOFSNODE,
415 isomp->logical_block_size = logical_block_size;
416 isomp->volume_space_size =
417 isonum_733 (high_sierra?
418 pri_sierra->volume_space_size:
419 pri->volume_space_size);
420 isomp->joliet_level = 0;
421 /*
422 * Since an ISO9660 multi-session CD can also access previous

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

707 return (0);
708
709 /* Allocate a new vnode/iso_node. */
710 if ((error = getnewvnode("isofs", mp, cd9660_vnodeop_p, &vp)) != 0) {
711 *vpp = NULLVP;
712 return (error);
713 }
714 MALLOC(ip, struct iso_node *, sizeof(struct iso_node), M_ISOFSNODE,
715 M_WAITOK | M_ZERO);
715 M_ZERO);
716 vp->v_data = ip;
717 ip->i_vnode = vp;
718 ip->i_dev = dev;
719 ip->i_number = ino;
720
721 /*
722 * Check to be sure that it did not show up. We have to put it
723 * on the hash chain as the cleanup from vput expects to find

--- 175 unchanged lines hidden ---
716 vp->v_data = ip;
717 ip->i_vnode = vp;
718 ip->i_dev = dev;
719 ip->i_number = ino;
720
721 /*
722 * Check to be sure that it did not show up. We have to put it
723 * on the hash chain as the cleanup from vput expects to find

--- 175 unchanged lines hidden ---