diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-06-01 22:30:49 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-06-01 22:30:49 +0000 |
| commit | d15c9890e9f728d449db02f4111216999416bb66 (patch) | |
| tree | 9288c3d404163f0f9df435da06c2c282c6aae031 /sys | |
| parent | 8e6616c399a7ffa90d49afd4e3bf01016b49dac8 (diff) | |
FIBMAP is used by nothing; checked by miod and pvalchev
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/isofs/cd9660/cd9660_vnops.c | 24 | ||||
| -rw-r--r-- | sys/kern/vfs_vnops.c | 5 | ||||
| -rw-r--r-- | sys/sys/filio.h | 3 |
3 files changed, 4 insertions, 28 deletions
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c index 3dd12ea608c..089d443e2f6 100644 --- a/sys/isofs/cd9660/cd9660_vnops.c +++ b/sys/isofs/cd9660/cd9660_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_vnops.c,v 1.40 2007/04/13 18:07:36 thib Exp $ */ +/* $OpenBSD: cd9660_vnops.c,v 1.41 2007/06/01 22:30:48 deraadt Exp $ */ /* $NetBSD: cd9660_vnops.c,v 1.42 1997/10/16 23:56:57 christos Exp $ */ /*- @@ -374,27 +374,7 @@ int cd9660_ioctl(v) void *v; { - struct vop_ioctl_args /* { - struct vnode *a_vp; - u_long a_command; - caddr_t a_data; - int a_fflag; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; - daddr32_t *blkp; - daddr64_t blk; - int error; - - switch (ap->a_command) { - case FIBMAP: - blkp = (daddr32_t *) ap->a_data; - error = VOP_BMAP(ap->a_vp, *blkp, NULL, &blk, 0); - *blkp = (daddr32_t) blk; - return (error); - default: - return (ENOTTY); - } + return (ENOTTY); } /* ARGSUSED */ diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index f7309c9ed72..79778f113ce 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_vnops.c,v 1.56 2007/05/05 12:03:04 art Exp $ */ +/* $OpenBSD: vfs_vnops.c,v 1.57 2007/06/01 22:30:46 deraadt Exp $ */ /* $NetBSD: vfs_vnops.c,v 1.20 1996/02/04 02:18:41 christos Exp $ */ /* @@ -420,9 +420,6 @@ vn_ioctl(struct file *fp, u_long com, caddr_t data, struct proc *p) *(int *)data = vattr.va_size - fp->f_offset; return (0); } - if (com == FIBMAP) - return VOP_IOCTL(vp, com, data, fp->f_flag, - p->p_ucred, p); if (com == FIONBIO || com == FIOASYNC) /* XXX */ return (0); /* XXX */ /* FALLTHROUGH */ diff --git a/sys/sys/filio.h b/sys/sys/filio.h index d71a17df38e..19fd8055138 100644 --- a/sys/sys/filio.h +++ b/sys/sys/filio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: filio.h,v 1.4 2003/06/02 23:28:21 millert Exp $ */ +/* $OpenBSD: filio.h,v 1.5 2007/06/01 22:30:48 deraadt Exp $ */ /* $NetBSD: filio.h,v 1.5 1994/06/29 06:44:14 cgd Exp $ */ /*- @@ -50,6 +50,5 @@ #define FIOASYNC _IOW('f', 125, int) /* set/clear async i/o */ #define FIOSETOWN _IOW('f', 124, int) /* set owner */ #define FIOGETOWN _IOR('f', 123, int) /* get owner */ -#define FIBMAP _IOWR('f', 122, daddr_t) /* get logical block */ #endif /* !_SYS_FILIO_H_ */ |