FIONREAD can only return 32-bit size

SCCS-vsn: sys/kern/vfs_vnops.c 7.45
SCCS-vsn: sys/kern/subr_log.c 7.15

diff --git a/usr/src/sys/kern/subr_log.c b/usr/src/sys/kern/subr_log.c
index f327f87..b3c0c49 100644 (file)
--- a/usr/src/sys/kern/subr_log.c
+++ b/usr/src/sys/kern/subr_log.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)subr_log.c  7.14 (Berkeley) %G%
+ *     @(#)subr_log.c  7.15 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -177,7 +177,7 @@ logioctl(dev, com, data, flag, p)
                splx(s);
                if (l < 0)
                        l += MSG_BSIZE;
                splx(s);
                if (l < 0)
                        l += MSG_BSIZE;

-               *(off_t *)data = l;
+               *(int *)data = l;

                break;
 
        case FIONBIO:
                break;
 
        case FIONBIO:

diff --git a/usr/src/sys/kern/vfs_vnops.c b/usr/src/sys/kern/vfs_vnops.c
index a9ad803..e66b2ea 100644 (file)
--- a/usr/src/sys/kern/vfs_vnops.c
+++ b/usr/src/sys/kern/vfs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vfs_vnops.c 7.44 (Berkeley) %G%
+ *     @(#)vfs_vnops.c 7.45 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -342,7 +342,7 @@ vn_ioctl(fp, com, data, p)
                if (com == FIONREAD) {
                        if (error = VOP_GETATTR(vp, &vattr, p->p_ucred, p))
                                return (error);
                if (com == FIONREAD) {
                        if (error = VOP_GETATTR(vp, &vattr, p->p_ucred, p))
                                return (error);

-                       *(off_t *)data = vattr.va_size - fp->f_offset;
+                       *(int *)data = vattr.va_size - fp->f_offset;

                        return (0);
                }
                if (com == FIONBIO || com == FIOASYNC)  /* XXX */
                        return (0);
                }
                if (com == FIONBIO || com == FIOASYNC)  /* XXX */