reorganization to move ufsmount ops to be vnode ops; blkatoff

SCCS-vsn: sys/ufs/lfs/lfs_subr.c 7.3

diff --git a/usr/src/sys/ufs/lfs/lfs_subr.c b/usr/src/sys/ufs/lfs/lfs_subr.c
index 68fcc9d..560339d 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_subr.c
+++ b/usr/src/sys/ufs/lfs/lfs_subr.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_subr.c  7.2 (Berkeley) %G%
+ *     @(#)lfs_subr.c  7.3 (Berkeley) %G%

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


@@ -24,23 +24,25 @@
  * remaining space in the directory.
  */
 int
  * remaining space in the directory.
  */
 int

-lfs_blkatoff(ip, offset, res, bpp)
-       struct inode *ip;
+lfs_blkatoff(vp, offset, res, bpp)
+       struct vnode *vp;

        off_t offset;
        char **res;
        struct buf **bpp;
 {
        register struct lfs *fs;
        off_t offset;
        char **res;
        struct buf **bpp;
 {
        register struct lfs *fs;

+       struct inode *ip;

        struct buf *bp;
        daddr_t lbn;
        int bsize, error;
 
        struct buf *bp;
        daddr_t lbn;
        int bsize, error;
 

+       ip = VTOI(vp);

        fs = ip->i_lfs;
        lbn = lblkno(fs, offset);
        bsize = blksize(fs);
 
        *bpp = NULL;
        fs = ip->i_lfs;
        lbn = lblkno(fs, offset);
        bsize = blksize(fs);
 
        *bpp = NULL;

-       if (error = bread(ITOV(ip), lbn, bsize, NOCRED, &bp)) {
+       if (error = bread(vp, lbn, bsize, NOCRED, &bp)) {

                brelse(bp);
                return (error);
        }
                brelse(bp);
                return (error);
        }