diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 1999-05-11 19:55:07 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 1999-05-11 19:55:07 +0000 |
| commit | bfbb9ce67005673c7b7c8b2267024adef44f7d1d (patch) | |
| tree | 9ffcbddb82416102ac7aed6b4c9c9b5bf02d13e3 /sys/compat/linux | |
| parent | ac9a7ff18c4b3ed2974b52ffccdddff73dfd5cad (diff) | |
Notes
Diffstat (limited to 'sys/compat/linux')
| -rw-r--r-- | sys/compat/linux/linux_file.c | 8 | ||||
| -rw-r--r-- | sys/compat/linux/linux_stats.c | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index e357e159cd84..3dc3cbc6c357 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: linux_file.c,v 1.24 1999/05/06 18:44:20 peter Exp $ + * $Id: linux_file.c,v 1.25 1999/05/08 06:39:26 phk Exp $ */ #include "opt_compat.h" @@ -204,6 +204,7 @@ linux_fcntl(struct proc *p, struct linux_fcntl_args *args) struct pgrp *pgrp; struct tty *tp, *(*d_tty) __P((dev_t)); caddr_t sg; + dev_t dev; sg = stackgap_init(); bsd_flock = (struct flock *)stackgap_alloc(&sg, sizeof(struct flock)); @@ -306,8 +307,9 @@ linux_fcntl(struct proc *p, struct linux_fcntl_args *args) if ((error = VOP_GETATTR(vp, &va, p->p_ucred, p))) return error; - d_tty = devsw(va.va_rdev)->d_devtotty; - if (!d_tty || (!(tp = (*d_tty)(va.va_rdev)))) + dev = udev2dev(va.va_rdev, 0); /* XXX vp->v_rdev ? */ + d_tty = devsw(dev)->d_devtotty; + if (!d_tty || (!(tp = (*d_tty)(dev)))) return EINVAL; if (args->cmd == LINUX_F_GETOWN) { p->p_retval[0] = tp->t_pgrp ? tp->t_pgrp->pg_id : NO_PID; diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c index 8e9db81a3fdb..e7f939092c99 100644 --- a/sys/compat/linux/linux_stats.c +++ b/sys/compat/linux/linux_stats.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: linux_stats.c,v 1.10 1999/05/06 18:44:28 peter Exp $ + * $Id: linux_stats.c,v 1.11 1999/05/09 10:25:30 phk Exp $ */ #include <sys/param.h> @@ -74,7 +74,7 @@ newstat_copyout(struct stat *buf, void *ubuf) { struct linux_newstat tbuf; - tbuf.stat_dev = minor(buf->st_dev) | (major(buf->st_dev) << 10); + tbuf.stat_dev = uminor(buf->st_dev) | (umajor(buf->st_dev) << 10); tbuf.stat_ino = buf->st_ino; tbuf.stat_mode = buf->st_mode; tbuf.stat_nlink = buf->st_nlink; |