aboutsummaryrefslogtreecommitdiff
path: root/sys/fs/cd9660
diff options
context:
space:
mode:
authorEdward Tomasz Napierala <trasz@FreeBSD.org>2008-10-28 13:44:11 +0000
committerEdward Tomasz Napierala <trasz@FreeBSD.org>2008-10-28 13:44:11 +0000
commit15bc6b2bd8d8c56ad74e57675dde8501bc7f53e1 (patch)
treecb5d9bbe34cd6eae2c3dd212bdfdfd85569424dd /sys/fs/cd9660
parent9215889d21ffb366dda6fcbd62483657769367f2 (diff)
Notes
Diffstat (limited to 'sys/fs/cd9660')
-rw-r--r--sys/fs/cd9660/cd9660_vfsops.c6
-rw-r--r--sys/fs/cd9660/cd9660_vnops.c8
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index 7a8953d93701..919ecf721a8a 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -128,7 +128,7 @@ cd9660_mount(struct mount *mp, struct thread *td)
struct vnode *devvp;
char *fspec;
int error;
- mode_t accessmode;
+ accmode_t accmode;
struct nameidata ndp;
struct iso_mnt *imp = 0;
@@ -168,9 +168,9 @@ cd9660_mount(struct mount *mp, struct thread *td)
* Verify that user has necessary permissions on the device,
* or has superuser abilities
*/
- accessmode = VREAD;
+ accmode = VREAD;
vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
- error = VOP_ACCESS(devvp, accessmode, td->td_ucred, td);
+ error = VOP_ACCESS(devvp, accmode, td->td_ucred, td);
if (error)
error = priv_check(td, PRIV_VFS_MOUNT_PERM);
if (error) {
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index 76fb233cf917..9e99a5be6c99 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -125,14 +125,14 @@ static int
cd9660_access(ap)
struct vop_access_args /* {
struct vnode *a_vp;
- int a_mode;
+ accmode_t a_accmode;
struct ucred *a_cred;
struct thread *a_td;
} */ *ap;
{
struct vnode *vp = ap->a_vp;
struct iso_node *ip = VTOI(vp);
- mode_t mode = ap->a_mode;
+ accmode_t accmode = ap->a_accmode;
if (vp->v_type == VCHR || vp->v_type == VBLK)
return (EOPNOTSUPP);
@@ -142,7 +142,7 @@ cd9660_access(ap)
* fifo, or a block or character device resident on the
* filesystem.
*/
- if (mode & VWRITE) {
+ if (accmode & VWRITE) {
switch (vp->v_type) {
case VDIR:
case VLNK:
@@ -155,7 +155,7 @@ cd9660_access(ap)
}
return (vaccess(vp->v_type, ip->inode.iso_mode, ip->inode.iso_uid,
- ip->inode.iso_gid, ap->a_mode, ap->a_cred, NULL));
+ ip->inode.iso_gid, ap->a_accmode, ap->a_cred, NULL));
}
static int