/*
- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
#include <sys/stat.h>
#include <sys/ubc.h>
#include <sys/utfconv.h>
-#include <architecture/byte_order.h>
#include <isofs/cd9660/iso.h>
#include <isofs/cd9660/iso_rrip.h>
cd9660_fhtovp,
cd9660_vptofh,
cd9660_init,
- cd9660_sysctl
+ cd9660_sysctl,
+ NULL,
+ {NULL}
};
/*
struct iso_mnt *imp = NULL;
if (vfs_context_is64bit(context)) {
- error = copyin(data, (caddr_t)&args, sizeof (args));
+ error = copyin(data, (caddr_t)&args, sizeof(args));
}
else {
struct iso_args temp;
- error = copyin(data, (caddr_t)&temp, sizeof (temp));
+ error = copyin(data, (caddr_t)&temp, sizeof(temp));
args.flags = temp.flags;
args.ssector = temp.ssector;
args.toc_length = temp.toc_length;
return (NULL);
/* Make a copy of the mount from name, then remove trailing "s...". */
- strncpy(whole_path, sfs->f_mntfromname, sizeof(whole_path)-1);
+ strlcpy(whole_path, sfs->f_mntfromname, sizeof(whole_path));
/*
* I would use strrchr or rindex here, but those are declared __private_extern__,
struct vnode *rvp = NULL;
struct vnode *videovp = NULL;
struct componentname cn;
- struct vfs_context context;
char dirname[] = "MPEGAV";
result = 0; /* Assume not a video CD */
return 0; /* couldn't find video dir */
}
- context.vc_proc = current_proc();
- context.vc_ucred = kauth_cred_get();
-
cn.cn_nameiop = LOOKUP;
cn.cn_flags = ISLASTCN;
- cn.cn_context = &context;
+ cn.cn_context = vfs_context_current();
cn.cn_pnbuf = dirname;
cn.cn_pnlen = sizeof(dirname)-1;
cn.cn_nameptr = cn.cn_pnbuf;
cn.cn_namelen = cn.cn_pnlen;
- err = VNOP_LOOKUP(rvp, &videovp, &cn, &context);
+ err = VNOP_LOOKUP(rvp, &videovp, &cn, cn.cn_context);
if (err == 0) {
struct iso_node *ip = VTOI(videovp);
result = 1; /* Looks like video CD */
* Common code for mount and mountroot
*/
static int
-iso_mountfs(devvp, mp, argp, context)
- register struct vnode *devvp;
- struct mount *mp;
- struct user_iso_args *argp;
- vfs_context_t context;
+iso_mountfs(struct vnode *devvp, struct mount *mp, struct user_iso_args *argp,
+ vfs_context_t context)
{
- struct proc *p;
- register struct iso_mnt *isomp = (struct iso_mnt *)0;
+ struct iso_mnt *isomp = (struct iso_mnt *)0;
struct buf *bp = NULL;
struct buf *pribp = NULL, *supbp = NULL;
dev_t dev = vnode_specrdev(devvp);
int error = EINVAL;
int breaderr = 0;
- u_long iso_bsize;
+ u_long iso_bsize, orig_bsize;
int iso_blknum;
int joliet_level;
struct iso_volume_descriptor *vdp = NULL;
if (vfs_isrdwr(mp))
return (EROFS);
+ /* Advisory locking should be handled at the VFS layer */
+ vfs_setlocklocal(mp);
+
+ /* Finish initializing hash tables */
+ cd9660_hashinit();
+
+ if ((error = VNOP_IOCTL(devvp, DKIOCGETBLOCKSIZE,
+ (caddr_t)&orig_bsize, 0, context)))
+ return (error);
+
/* This is the "logical sector size". The standard says this
* should be 2048 or the physical sector size on the device,
* whichever is greater. For now, we'll just use a constant.
continue;
}
- vdp = (struct iso_volume_descriptor *)buf_dataptr(bp);
+ vdp = (struct iso_volume_descriptor *)((char *)0 + buf_dataptr(bp));
if (bcmp (vdp->volume_desc_id, ISO_STANDARD_ID, sizeof(vdp->volume_desc_id)) != 0) {
#ifdef DEBUG
printf("cd9660_vfsops.c: iso_mountfs: "
rootp = (struct iso_directory_record *)pri->root_directory_record;
- MALLOC(isomp, struct iso_mnt *, sizeof *isomp, M_ISOFSMNT, M_WAITOK);
- bzero((caddr_t)isomp, sizeof *isomp);
+ MALLOC(isomp, struct iso_mnt *, sizeof(*isomp), M_ISOFSMNT, M_WAITOK);
+ bzero((caddr_t)isomp, sizeof(*isomp));
isomp->im_sector_size = ISO_DEFAULT_BLOCK_SIZE;
isomp->logical_block_size = logical_block_size;
isomp->volume_space_size = isonum_733 (pri->volume_space_size);
* filehandle validation.
*/
isomp->volume_space_size += blkoff;
- bcopy (rootp, isomp->root, sizeof isomp->root);
+ bcopy (rootp, isomp->root, sizeof(isomp->root));
isomp->root_extent = isonum_733 (rootp->extent);
isomp->root_size = isonum_733 (rootp->size);
}
if (pri->volume_id[0] == 0)
- strcpy(isomp->volume_id, ISO_DFLT_VOLUME_ID);
+ strlcpy(isomp->volume_id, ISO_DFLT_VOLUME_ID, sizeof(isomp->volume_id));
else
bcopy(pri->volume_id, isomp->volume_id, sizeof(isomp->volume_id));
cd9660_tstamp_conv17(pri->creation_date, &isomp->creation_date);
argp->flags |= ISOFSMNT_NORRIP;
goto skipRRIP;
}
- rootp = (struct iso_directory_record *)buf_dataptr(bp);
+ rootp = (struct iso_directory_record *)((char *)0 + buf_dataptr(bp));
if ((isomp->rr_skip = cd9660_rrip_offset(rootp,isomp)) < 0) {
argp->flags |= ISOFSMNT_NORRIP;
*
* This name can have up to 16 UCS-2 chars.
*/
- convflags = UTF_DECOMPOSED;
- if (BYTE_ORDER != BIG_ENDIAN)
- convflags |= UTF_REVERSE_ENDIAN;
+ convflags = UTF_DECOMPOSED | UTF_BIG_ENDIAN;
uchp = (u_int16_t *)sup->volume_id;
for (i = 0; i < 16 && uchp[i]; ++i);
if ((utf8_encodestr((u_int16_t *)sup->volume_id, (i * 2), vol_id,
rootp = (struct iso_directory_record *)
sup->root_directory_record;
- bcopy (rootp, isomp->root, sizeof isomp->root);
+ bcopy (rootp, isomp->root, sizeof(isomp->root));
isomp->root_extent = isonum_733 (rootp->extent);
isomp->root_size = isonum_733 (rootp->size);
buf_markaged(supbp);
return (0);
out:
+ if (orig_bsize != iso_bsize) {
+ (void)VNOP_IOCTL(devvp, DKIOCSETBLOCKSIZE,
+ (caddr_t)&orig_bsize, FWRITE, context);
+ }
+
if (bp)
buf_brelse(bp);
if (pribp)
int
cd9660_unmount(struct mount *mp, int mntflags, vfs_context_t context)
{
- register struct iso_mnt *isomp;
+ struct iso_mnt *isomp;
int error, flags = 0;
int force = 0;
*/
/* ARGSUSED */
int
-cd9660_statfs(struct mount *mp, register struct vfsstatfs *sbp,
+cd9660_statfs(struct mount *mp, struct vfsstatfs *sbp,
__unused vfs_context_t context)
{
- register struct iso_mnt *isomp;
+ struct iso_mnt *isomp;
isomp = VFSTOISOFS(mp);
return (0);
}
-int cd9660_vfs_getattr(struct mount *mp, struct vfs_attr *fsap, vfs_context_t context)
+int cd9660_vfs_getattr(struct mount *mp, struct vfs_attr *fsap, __unused vfs_context_t context)
{
struct iso_mnt *imp;
struct vfsstatfs *stats = vfs_statfs(mp);
VOL_CAP_INT_SEARCHFS |
VOL_CAP_INT_ATTRLIST |
VOL_CAP_INT_NFSEXPORT |
- VOL_CAP_INT_READDIRATTR |
- VOL_CAP_INT_EXCHANGEDATA |
- VOL_CAP_INT_COPYFILE |
VOL_CAP_INT_ALLOCATE |
- VOL_CAP_INT_VOL_RENAME |
VOL_CAP_INT_ADVLOCK |
VOL_CAP_INT_FLOCK;
fsap->f_capabilities.valid[VOL_CAPABILITIES_RESERVED1] = 0;
* VFS has implemented.
*/
- fsap->f_attributes.validattr.commonattr = ATTR_CMN_VALIDMASK;
- fsap->f_attributes.validattr.volattr = ATTR_VOL_VALIDMASK;
- fsap->f_attributes.validattr.dirattr = ATTR_DIR_VALIDMASK;
+#define ISOFS_ATTR_CMN_VALIDMASK (ATTR_CMN_VALIDMASK & ~(ATTR_CMN_PAROBJID | ATTR_CMN_CRTIME | ATTR_CMN_BKUPTIME | ATTR_CMN_PARENTID))
+#define ISOFS_ATTR_VOL_VALIDMASK (ATTR_VOL_VALIDMASK & ~(ATTR_VOL_OBJCOUNT | ATTR_VOL_FILECOUNT | ATTR_VOL_DIRCOUNT | ATTR_VOL_MAXOBJCOUNT | ATTR_VOL_NAME))
+#define ISOFS_ATTR_DIR_VALIDMASK (ATTR_DIR_VALIDMASK & ~(ATTR_DIR_ENTRYCOUNT))
+
+ fsap->f_attributes.validattr.commonattr = ISOFS_ATTR_CMN_VALIDMASK;
+ fsap->f_attributes.validattr.volattr = ISOFS_ATTR_VOL_VALIDMASK;
+ fsap->f_attributes.validattr.dirattr = ISOFS_ATTR_DIR_VALIDMASK;
fsap->f_attributes.validattr.fileattr = ATTR_FILE_VALIDMASK;
fsap->f_attributes.validattr.forkattr = ATTR_FORK_VALIDMASK;
- fsap->f_attributes.nativeattr.commonattr = ATTR_CMN_VALIDMASK;
- fsap->f_attributes.nativeattr.volattr = ATTR_VOL_VALIDMASK;
- fsap->f_attributes.nativeattr.dirattr = ATTR_DIR_VALIDMASK;
+ fsap->f_attributes.nativeattr.commonattr = ISOFS_ATTR_CMN_VALIDMASK;
+ fsap->f_attributes.nativeattr.volattr = ISOFS_ATTR_VOL_VALIDMASK;
+ fsap->f_attributes.nativeattr.dirattr = ISOFS_ATTR_DIR_VALIDMASK;
fsap->f_attributes.nativeattr.fileattr = ATTR_FILE_VALIDMASK;
fsap->f_attributes.nativeattr.forkattr = ATTR_FORK_VALIDMASK;
cd9660_fhtovp(mount_t mp, int fhlen, unsigned char *fhp, vnode_t *vpp, vfs_context_t context)
{
struct ifid *ifhp = (struct ifid *)fhp;
- register struct iso_node *ip;
+ struct iso_node *ip;
struct vnode *nvp;
int error;
ifhp->ifid_ino, ifhp->ifid_start);
#endif
- if ( (error = VFS_VGET(mp, (ino64_t)ifhp->ifid_ino, &nvp, context)) ) {
+ if ( (error = VFS_VGET(mp, (ino64_t)ntohl(ifhp->ifid_ino), &nvp, context)) ) {
*vpp = NULLVP;
return (error);
}
struct componentname *cnp, int relocated,
struct iso_directory_record *isodir, proc_t p)
{
- register struct iso_mnt *imp;
+ struct iso_mnt *imp;
struct iso_node *ip;
buf_t bp = NULL;
vnode_t vp;
struct iso_directory_record *pdp;
pdp = (struct iso_directory_record *)
- ((char *)buf_dataptr(bp) + isonum_711(isodir->length));
+ ((char *)0 + buf_dataptr(bp) + isonum_711(isodir->length));
if ((isonum_711(pdp->flags) & directoryBit)
&& (pdp->name[0] == 1))
ip->i_parent = isodirino(pdp, imp);
if ((error = (int)buf_bread(imp->im_devvp, lbn, imp->im_sector_size, NOCRED, &bp)))
goto errout;
- isodir = (struct iso_directory_record *)buf_dataptr(bp);
+ isodir = (struct iso_directory_record *)((char *)0 + buf_dataptr(bp));
}
/*
int
cd9660_vptofh(struct vnode *vp, int *fhlenp, unsigned char *fhp, __unused vfs_context_t context)
{
- register struct iso_node *ip = VTOI(vp);
- register struct ifid *ifhp;
+ struct iso_node *ip = VTOI(vp);
+ struct ifid *ifhp;
if (*fhlenp < (int)sizeof(struct ifid))
return (EOVERFLOW);
ifhp = (struct ifid *)fhp;
- ifhp->ifid_ino = ip->i_number;
- ifhp->ifid_start = ip->iso_start;
+ ifhp->ifid_ino = htonl(ip->i_number);
+ ifhp->ifid_start = htonl(ip->iso_start);
*fhlenp = sizeof(struct ifid);
#ifdef ISOFS_DBG
projects / apple / xnu.git / blobdiff