Deleted Added
full compact
cd9660_vfsops.c (36735) cd9660_vfsops.c (37389)
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 * $Id: cd9660_vfsops.c,v 1.39 1998/05/06 05:29:30 msmith Exp $
39 * $Id: cd9660_vfsops.c,v 1.40 1998/06/07 17:11:29 dfr Exp $
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>

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

109static int
110iso_get_ssector(dev, p)
111 dev_t dev;
112 struct proc *p;
113{
114 struct ioc_toc_header h;
115 struct ioc_read_toc_single_entry t;
116 int i;
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>

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

109static int
110iso_get_ssector(dev, p)
111 dev_t dev;
112 struct proc *p;
113{
114 struct ioc_toc_header h;
115 struct ioc_read_toc_single_entry t;
116 int i;
117 struct bdevsw *bd;
117 struct cdevsw *bd;
118 d_ioctl_t *ioctlp;
119
120 bd = bdevsw[major(dev)];
121 ioctlp = bd->d_ioctl;
122 if (ioctlp == NULL)
123 return 0;
124
125 if (ioctlp(dev, CDIOREADTOCHEADER, (caddr_t)&h, FREAD, p) == -1)

--- 770 unchanged lines hidden ---
118 d_ioctl_t *ioctlp;
119
120 bd = bdevsw[major(dev)];
121 ioctlp = bd->d_ioctl;
122 if (ioctlp == NULL)
123 return 0;
124
125 if (ioctlp(dev, CDIOREADTOCHEADER, (caddr_t)&h, FREAD, p) == -1)

--- 770 unchanged lines hidden ---