vnodeop argument macro expansion

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

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

- *     @(#)ffs_subr.c  7.19 (Berkeley) %G%
+ *     @(#)ffs_subr.c  7.20 (Berkeley) %G%

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


@@ -25,10 +25,6 @@
 int
 ffs_blkatoff (ap)
        struct vop_blkatoff_args *ap;
 int
 ffs_blkatoff (ap)
        struct vop_blkatoff_args *ap;

-#define vp (ap->a_vp)
-#define offset (ap->a_offset)
-#define res (ap->a_res)
-#define bpp (ap->a_bpp)

 {
        struct inode *ip;
        register struct fs *fs;
 {
        struct inode *ip;
        register struct fs *fs;


@@ -36,25 +32,21 @@ ffs_blkatoff (ap)
        daddr_t lbn;
        int bsize, error;
 
        daddr_t lbn;
        int bsize, error;
 

-       ip = VTOI(vp);
+       ip = VTOI(ap->a_vp);

        fs = ip->i_fs;
        fs = ip->i_fs;

-       lbn = lblkno(fs, offset);
+       lbn = lblkno(fs, ap->a_offset);

        bsize = blksize(fs, ip, lbn);
 
        bsize = blksize(fs, ip, lbn);
 

-       *bpp = NULL;
-       if (error = bread(vp, lbn, bsize, NOCRED, &bp)) {
+       *ap->a_bpp = NULL;
+       if (error = bread(ap->a_vp, lbn, bsize, NOCRED, &bp)) {

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

-       if (res)
-               *res = bp->b_un.b_addr + blkoff(fs, offset);
-       *bpp = bp;
+       if (ap->a_res)
+               *ap->a_res = bp->b_un.b_addr + blkoff(fs, ap->a_offset);
+       *ap->a_bpp = bp;

        return (0);
 }
        return (0);
 }

-#undef vp
-#undef offset
-#undef res
-#undef bpp

 #endif
 
 /*
 #endif
 
 /*