Deleted Added
full compact
iso.h (5651) iso.h (8876)
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 * @(#)iso.h 8.2 (Berkeley) 1/23/94
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 * @(#)iso.h 8.2 (Berkeley) 1/23/94
39 * $Id: iso.h,v 1.3 1994/09/09 11:11:01 dfr Exp $
39 * $Id: iso.h,v 1.4 1995/01/16 17:03:29 joerg Exp $
40 */
41
42#define ISODCL(from, to) (to - from + 1)
43
44struct iso_volume_descriptor {
45 char type[ISODCL(1,1)]; /* 711 */
46 char id[ISODCL(2,6)];
47 char version[ISODCL(7,7)];

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

184
185 struct mount *im_mountp;
186 dev_t im_dev;
187 struct vnode *im_devvp;
188
189 int logical_block_size;
190 int im_bshift;
191 int im_bmask;
40 */
41
42#define ISODCL(from, to) (to - from + 1)
43
44struct iso_volume_descriptor {
45 char type[ISODCL(1,1)]; /* 711 */
46 char id[ISODCL(2,6)];
47 char version[ISODCL(7,7)];

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

184
185 struct mount *im_mountp;
186 dev_t im_dev;
187 struct vnode *im_devvp;
188
189 int logical_block_size;
190 int im_bshift;
191 int im_bmask;
192
192
193 int volume_space_size;
194 char im_fsmnt[50];
195 struct netexport im_export;
193 int volume_space_size;
194 char im_fsmnt[50];
195 struct netexport im_export;
196
196
197 char root[ISODCL (157, 190)];
198 int root_extent;
199 int root_size;
200 enum ISO_FTYPE iso_ftype;
197 char root[ISODCL (157, 190)];
198 int root_extent;
199 int root_size;
200 enum ISO_FTYPE iso_ftype;
201
201
202 int rr_skip;
203 int rr_skip0;
204};
205
206#define VFSTOISOFS(mp) ((struct iso_mnt *)((mp)->mnt_data))
207
208#define iso_blkoff(imp, loc) ((loc) & (imp)->im_bmask)
209#define iso_lblkno(imp, loc) ((loc) >> (imp)->im_bshift)

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

223int cd9660_sync __P((struct mount *, int, struct ucred *, struct proc *));
224int cd9660_vget __P((struct mount *, ino_t, struct vnode **));
225int cd9660_fhtovp __P((struct mount *, struct fid *, struct mbuf *,
226 struct vnode **, int *, struct ucred **));
227int cd9660_vptofh __P((struct vnode *, struct fid *));
228int cd9660_init __P(());
229
230struct iso_node;
202 int rr_skip;
203 int rr_skip0;
204};
205
206#define VFSTOISOFS(mp) ((struct iso_mnt *)((mp)->mnt_data))
207
208#define iso_blkoff(imp, loc) ((loc) & (imp)->im_bmask)
209#define iso_lblkno(imp, loc) ((loc) >> (imp)->im_bshift)

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

223int cd9660_sync __P((struct mount *, int, struct ucred *, struct proc *));
224int cd9660_vget __P((struct mount *, ino_t, struct vnode **));
225int cd9660_fhtovp __P((struct mount *, struct fid *, struct mbuf *,
226 struct vnode **, int *, struct ucred **));
227int cd9660_vptofh __P((struct vnode *, struct fid *));
228int cd9660_init __P(());
229
230struct iso_node;
231int iso_blkatoff __P((struct iso_node *ip, long offset, struct buf **bpp));
231int iso_blkatoff __P((struct iso_node *ip, long offset, struct buf **bpp));
232int iso_iget __P((struct iso_node *xp, ino_t ino, int relocated,
233 struct iso_node **ipp, struct iso_directory_record *isodir));
232int iso_iget __P((struct iso_node *xp, ino_t ino, int relocated,
233 struct iso_node **ipp, struct iso_directory_record *isodir));
234int iso_iput __P((struct iso_node *ip));
235int iso_ilock __P((struct iso_node *ip));
236int iso_iunlock __P((struct iso_node *ip));
237int cd9660_mountroot __P((void));
234int iso_iput __P((struct iso_node *ip));
235int iso_ilock __P((struct iso_node *ip));
236int iso_iunlock __P((struct iso_node *ip));
237int cd9660_mountroot __P((void));
238
239extern int (**cd9660_vnodeop_p)();
240
241extern inline int
242isonum_711(p)
243 unsigned char *p;
244{
245 return *p;

--- 59 unchanged lines hidden ---
238
239extern int (**cd9660_vnodeop_p)();
240
241extern inline int
242isonum_711(p)
243 unsigned char *p;
244{
245 return *p;

--- 59 unchanged lines hidden ---