Use ufs_bmap rather than ffs_bmap.

[unix-history] / usr / src / sys / ufs / ffs / ffs_vnops.c

diff --git a/usr/src/sys/ufs/ffs/ffs_vnops.c b/usr/src/sys/ufs/ffs/ffs_vnops.c
index 2e3cdda..bb4120c 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ffs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ffs_vnops.c 7.91 (Berkeley) %G%
+ *     @(#)ffs_vnops.c 7.93 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -66,7 +66,7 @@ struct vnodeopv_entry_desc ffs_vnodeop_entries[] = {
        { &vop_reclaim_desc, ufs_reclaim },             /* reclaim */
        { &vop_lock_desc, ufs_lock },                   /* lock */
        { &vop_unlock_desc, ufs_unlock },               /* unlock */
        { &vop_reclaim_desc, ufs_reclaim },             /* reclaim */
        { &vop_lock_desc, ufs_lock },                   /* lock */
        { &vop_unlock_desc, ufs_unlock },               /* unlock */

-       { &vop_bmap_desc, ffs_bmap },                   /* bmap */
+       { &vop_bmap_desc, ufs_bmap },                   /* bmap */

        { &vop_strategy_desc, ufs_strategy },           /* strategy */
        { &vop_print_desc, ufs_print },                 /* print */
        { &vop_islocked_desc, ufs_islocked },           /* islocked */
        { &vop_strategy_desc, ufs_strategy },           /* strategy */
        { &vop_print_desc, ufs_print },                 /* print */
        { &vop_islocked_desc, ufs_islocked },           /* islocked */


@@ -208,7 +208,7 @@ ffs_read(ap)
        type = ip->i_mode & IFMT;
        if (type != IFDIR && type != IFREG && type != IFLNK)
                panic("ffs_read type");
        type = ip->i_mode & IFMT;
        if (type != IFDIR && type != IFREG && type != IFLNK)
                panic("ffs_read type");

-       if (type == IFLNK && ip->i_size < vp->v_mount->mnt_maxsymlinklen)
+       if (type == IFLNK && (int)ip->i_size < vp->v_mount->mnt_maxsymlinklen)

                panic("read short symlink");
 #endif
        if (uio->uio_resid == 0)
                panic("read short symlink");
 #endif
        if (uio->uio_resid == 0)