diff options
| author |   mpi <mpi@openbsd.org> | 2015-04-30 09:20:51 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2015-04-30 09:20:51 +0000 |
| commit | d6bcf78bdbc99f5411dcde1163b12ff573f66ca9 (patch) | |
| tree | 72cf7b77446f3c974d397b9f40465b599f432e3e /sys/compat/linux/linux_cdrom.c | |
| parent | use adolf, not adolph, for hitler, to keep it consistent; (diff) | |
| download | wireguard-openbsd-d6bcf78bdbc99f5411dcde1163b12ff573f66ca9.tar.xz wireguard-openbsd-d6bcf78bdbc99f5411dcde1163b12ff573f66ca9.zip | |
Indroduce fd_getfile_mode() and use it were fd_getfile() is directly
followed by a mode check. This will simplify the ref/unref dance as
soon as fd_getfile() will increment fp's reference counter.
Idea from and ok guenther@, ok millert@
Diffstat (limited to 'sys/compat/linux/linux_cdrom.c')
| -rw-r--r-- | sys/compat/linux/linux_cdrom.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/compat/linux/linux_cdrom.c b/sys/compat/linux/linux_cdrom.c index b1ca8e16af0..033a94bd8bb 100644 --- a/sys/compat/linux/linux_cdrom.c +++ b/sys/compat/linux/linux_cdrom.c @@ -1,5 +1,5 @@ -/* $OpenBSD: linux_cdrom.c,v 1.11 2014/03/26 05:23:42 guenther Exp $ */ +/* $OpenBSD: linux_cdrom.c,v 1.12 2015/04/30 09:20:51 mpi Exp $ */ /* * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de> * All rights reserved. @@ -108,15 +108,10 @@ linux_ioctl_cdrom(p, v, retval) fdp = p->p_fd; - if ((fp = fd_getfile(fdp, SCARG(uap, fd))) == NULL) + if ((fp = fd_getfile_mode(fdp, SCARG(uap, fd), FREAD|FWRITE)) == NULL) return (EBADF); FREF(fp); - if ((fp->f_flag & (FREAD | FWRITE)) == 0) { - error = EBADF; - goto out; - } - com = SCARG(uap, com); retval[0] = 0; |