change free() to blkfree() to allow for malloc()/free()

SCCS-vsn: sys/ufs/ffs/ffs_alloc.c 7.3
SCCS-vsn: sys/ufs/lfs/lfs_alloc.c 7.3
SCCS-vsn: sys/ufs/ffs/ffs_inode.c 7.3
SCCS-vsn: sys/ufs/ffs/ufs_inode.c 7.3
SCCS-vsn: sys/ufs/lfs/lfs_inode.c 7.3
SCCS-vsn: sys/ufs/ufs/ufs_inode.c 7.3

diff --git a/usr/src/sys/ufs/ffs/ffs_alloc.c b/usr/src/sys/ufs/ffs/ffs_alloc.c
index cc78876..a3922c4 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_alloc.c
+++ b/usr/src/sys/ufs/ffs/ffs_alloc.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

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

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


@@ -239,9 +239,9 @@ realloccg(ip, bprev, bpref, osize, nsize)
                        u.u_ru.ru_oublock--;            /* delete charge */
                }
                brelse(obp);
                        u.u_ru.ru_oublock--;            /* delete charge */
                }
                brelse(obp);

-               free(ip, bprev, (off_t)osize);
+               blkfree(ip, bprev, (off_t)osize);

                if (nsize < request)
                if (nsize < request)

-                       free(ip, bno + numfrags(fs, nsize),
+                       blkfree(ip, bno + numfrags(fs, nsize),

                                (off_t)(request - nsize));
                ip->i_blocks += btodb(nsize - osize);
                ip->i_flag |= IUPD|ICHG;
                                (off_t)(request - nsize));
                ip->i_blocks += btodb(nsize - osize);
                ip->i_flag |= IUPD|ICHG;


@@ -849,7 +849,7 @@ gotit:
  * free map. If a fragment is deallocated, a possible 
  * block reassembly is checked.
  */
  * free map. If a fragment is deallocated, a possible 
  * block reassembly is checked.
  */

-free(ip, bno, size)
+blkfree(ip, bno, size)

        register struct inode *ip;
        daddr_t bno;
        off_t size;
        register struct inode *ip;
        daddr_t bno;
        off_t size;


@@ -864,7 +864,7 @@ free(ip, bno, size)
        if ((unsigned)size > fs->fs_bsize || fragoff(fs, size) != 0) {
                printf("dev = 0x%x, bsize = %d, size = %d, fs = %s\n",
                    ip->i_dev, fs->fs_bsize, size, fs->fs_fsmnt);
        if ((unsigned)size > fs->fs_bsize || fragoff(fs, size) != 0) {
                printf("dev = 0x%x, bsize = %d, size = %d, fs = %s\n",
                    ip->i_dev, fs->fs_bsize, size, fs->fs_fsmnt);

-               panic("free: bad size");
+               panic("blkfree: bad size");

        }
        cg = dtog(fs, bno);
        if (badblock(fs, bno)) {
        }
        cg = dtog(fs, bno);
        if (badblock(fs, bno)) {


@@ -888,7 +888,7 @@ free(ip, bno, size)
                if (isblock(fs, cgp->cg_free, fragstoblks(fs, bno))) {
                        printf("dev = 0x%x, block = %d, fs = %s\n",
                            ip->i_dev, bno, fs->fs_fsmnt);
                if (isblock(fs, cgp->cg_free, fragstoblks(fs, bno))) {
                        printf("dev = 0x%x, block = %d, fs = %s\n",
                            ip->i_dev, bno, fs->fs_fsmnt);

-                       panic("free: freeing free block");
+                       panic("blkfree: freeing free block");

                }
                setblock(fs, cgp->cg_free, fragstoblks(fs, bno));
                cgp->cg_cs.cs_nbfree++;
                }
                setblock(fs, cgp->cg_free, fragstoblks(fs, bno));
                cgp->cg_cs.cs_nbfree++;


@@ -912,7 +912,7 @@ free(ip, bno, size)
                        if (isset(cgp->cg_free, bno + i)) {
                                printf("dev = 0x%x, block = %d, fs = %s\n",
                                    ip->i_dev, bno + i, fs->fs_fsmnt);
                        if (isset(cgp->cg_free, bno + i)) {
                                printf("dev = 0x%x, block = %d, fs = %s\n",
                                    ip->i_dev, bno + i, fs->fs_fsmnt);

-                               panic("free: freeing free frag");
+                               panic("blkfree: freeing free frag");

                        }
                        setbit(cgp->cg_free, bno + i);
                }
                        }
                        setbit(cgp->cg_free, bno + i);
                }

diff --git a/usr/src/sys/ufs/ffs/ffs_inode.c b/usr/src/sys/ufs/ffs/ffs_inode.c
index 6f51d86..d720c33 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_inode.c
+++ b/usr/src/sys/ufs/ffs/ffs_inode.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

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

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


@@ -483,7 +483,7 @@ itrunc(oip, length)
                            indirtrunc(ip, bn, lastiblock[level], level);
                        if (lastiblock[level] < 0) {
                                ip->i_ib[level] = 0;
                            indirtrunc(ip, bn, lastiblock[level], level);
                        if (lastiblock[level] < 0) {
                                ip->i_ib[level] = 0;

-                               free(ip, bn, (off_t)fs->fs_bsize);
+                               blkfree(ip, bn, (off_t)fs->fs_bsize);

                                blocksreleased += nblocks;
                        }
                }
                                blocksreleased += nblocks;
                        }
                }


@@ -502,7 +502,7 @@ itrunc(oip, length)
                        continue;
                ip->i_db[i] = 0;
                bsize = (off_t)blksize(fs, ip, i);
                        continue;
                ip->i_db[i] = 0;
                bsize = (off_t)blksize(fs, ip, i);

-               free(ip, bn, bsize);
+               blkfree(ip, bn, bsize);

                blocksreleased += btodb(bsize);
        }
        if (lastblock < 0)
                blocksreleased += btodb(bsize);
        }
        if (lastblock < 0)


@@ -532,7 +532,7 @@ itrunc(oip, length)
                         * required for the storage we're keeping.
                         */
                        bn += numfrags(fs, newspace);
                         * required for the storage we're keeping.
                         */
                        bn += numfrags(fs, newspace);

-                       free(ip, bn, oldspace - newspace);
+                       blkfree(ip, bn, oldspace - newspace);

                        blocksreleased += btodb(oldspace - newspace);
                }
        }
                        blocksreleased += btodb(oldspace - newspace);
                }
        }


@@ -624,7 +624,7 @@ indirtrunc(ip, bn, lastbn, level)
                if (level > SINGLE)
                        blocksreleased +=
                            indirtrunc(ip, nb, (daddr_t)-1, level - 1);
                if (level > SINGLE)
                        blocksreleased +=
                            indirtrunc(ip, nb, (daddr_t)-1, level - 1);

-               free(ip, nb, (off_t)fs->fs_bsize);
+               blkfree(ip, nb, (off_t)fs->fs_bsize);

                blocksreleased += nblocks;
        }
 
                blocksreleased += nblocks;
        }
 

diff --git a/usr/src/sys/ufs/ffs/ufs_inode.c b/usr/src/sys/ufs/ffs/ufs_inode.c
index e8de953..c97d867 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_inode.c
+++ b/usr/src/sys/ufs/ffs/ufs_inode.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

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

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


@@ -483,7 +483,7 @@ itrunc(oip, length)
                            indirtrunc(ip, bn, lastiblock[level], level);
                        if (lastiblock[level] < 0) {
                                ip->i_ib[level] = 0;
                            indirtrunc(ip, bn, lastiblock[level], level);
                        if (lastiblock[level] < 0) {
                                ip->i_ib[level] = 0;

-                               free(ip, bn, (off_t)fs->fs_bsize);
+                               blkfree(ip, bn, (off_t)fs->fs_bsize);

                                blocksreleased += nblocks;
                        }
                }
                                blocksreleased += nblocks;
                        }
                }


@@ -502,7 +502,7 @@ itrunc(oip, length)
                        continue;
                ip->i_db[i] = 0;
                bsize = (off_t)blksize(fs, ip, i);
                        continue;
                ip->i_db[i] = 0;
                bsize = (off_t)blksize(fs, ip, i);

-               free(ip, bn, bsize);
+               blkfree(ip, bn, bsize);

                blocksreleased += btodb(bsize);
        }
        if (lastblock < 0)
                blocksreleased += btodb(bsize);
        }
        if (lastblock < 0)


@@ -532,7 +532,7 @@ itrunc(oip, length)
                         * required for the storage we're keeping.
                         */
                        bn += numfrags(fs, newspace);
                         * required for the storage we're keeping.
                         */
                        bn += numfrags(fs, newspace);

-                       free(ip, bn, oldspace - newspace);
+                       blkfree(ip, bn, oldspace - newspace);

                        blocksreleased += btodb(oldspace - newspace);
                }
        }
                        blocksreleased += btodb(oldspace - newspace);
                }
        }


@@ -624,7 +624,7 @@ indirtrunc(ip, bn, lastbn, level)
                if (level > SINGLE)
                        blocksreleased +=
                            indirtrunc(ip, nb, (daddr_t)-1, level - 1);
                if (level > SINGLE)
                        blocksreleased +=
                            indirtrunc(ip, nb, (daddr_t)-1, level - 1);

-               free(ip, nb, (off_t)fs->fs_bsize);
+               blkfree(ip, nb, (off_t)fs->fs_bsize);

                blocksreleased += nblocks;
        }
 
                blocksreleased += nblocks;
        }
 

diff --git a/usr/src/sys/ufs/lfs/lfs_alloc.c b/usr/src/sys/ufs/lfs/lfs_alloc.c
index 19db9e4..5c34fe3 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_alloc.c
+++ b/usr/src/sys/ufs/lfs/lfs_alloc.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

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

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


@@ -239,9 +239,9 @@ realloccg(ip, bprev, bpref, osize, nsize)
                        u.u_ru.ru_oublock--;            /* delete charge */
                }
                brelse(obp);
                        u.u_ru.ru_oublock--;            /* delete charge */
                }
                brelse(obp);

-               free(ip, bprev, (off_t)osize);
+               blkfree(ip, bprev, (off_t)osize);

                if (nsize < request)
                if (nsize < request)

-                       free(ip, bno + numfrags(fs, nsize),
+                       blkfree(ip, bno + numfrags(fs, nsize),

                                (off_t)(request - nsize));
                ip->i_blocks += btodb(nsize - osize);
                ip->i_flag |= IUPD|ICHG;
                                (off_t)(request - nsize));
                ip->i_blocks += btodb(nsize - osize);
                ip->i_flag |= IUPD|ICHG;


@@ -849,7 +849,7 @@ gotit:
  * free map. If a fragment is deallocated, a possible 
  * block reassembly is checked.
  */
  * free map. If a fragment is deallocated, a possible 
  * block reassembly is checked.
  */

-free(ip, bno, size)
+blkfree(ip, bno, size)

        register struct inode *ip;
        daddr_t bno;
        off_t size;
        register struct inode *ip;
        daddr_t bno;
        off_t size;


@@ -864,7 +864,7 @@ free(ip, bno, size)
        if ((unsigned)size > fs->fs_bsize || fragoff(fs, size) != 0) {
                printf("dev = 0x%x, bsize = %d, size = %d, fs = %s\n",
                    ip->i_dev, fs->fs_bsize, size, fs->fs_fsmnt);
        if ((unsigned)size > fs->fs_bsize || fragoff(fs, size) != 0) {
                printf("dev = 0x%x, bsize = %d, size = %d, fs = %s\n",
                    ip->i_dev, fs->fs_bsize, size, fs->fs_fsmnt);

-               panic("free: bad size");
+               panic("blkfree: bad size");

        }
        cg = dtog(fs, bno);
        if (badblock(fs, bno)) {
        }
        cg = dtog(fs, bno);
        if (badblock(fs, bno)) {


@@ -888,7 +888,7 @@ free(ip, bno, size)
                if (isblock(fs, cgp->cg_free, fragstoblks(fs, bno))) {
                        printf("dev = 0x%x, block = %d, fs = %s\n",
                            ip->i_dev, bno, fs->fs_fsmnt);
                if (isblock(fs, cgp->cg_free, fragstoblks(fs, bno))) {
                        printf("dev = 0x%x, block = %d, fs = %s\n",
                            ip->i_dev, bno, fs->fs_fsmnt);

-                       panic("free: freeing free block");
+                       panic("blkfree: freeing free block");

                }
                setblock(fs, cgp->cg_free, fragstoblks(fs, bno));
                cgp->cg_cs.cs_nbfree++;
                }
                setblock(fs, cgp->cg_free, fragstoblks(fs, bno));
                cgp->cg_cs.cs_nbfree++;


@@ -912,7 +912,7 @@ free(ip, bno, size)
                        if (isset(cgp->cg_free, bno + i)) {
                                printf("dev = 0x%x, block = %d, fs = %s\n",
                                    ip->i_dev, bno + i, fs->fs_fsmnt);
                        if (isset(cgp->cg_free, bno + i)) {
                                printf("dev = 0x%x, block = %d, fs = %s\n",
                                    ip->i_dev, bno + i, fs->fs_fsmnt);

-                               panic("free: freeing free frag");
+                               panic("blkfree: freeing free frag");

                        }
                        setbit(cgp->cg_free, bno + i);
                }
                        }
                        setbit(cgp->cg_free, bno + i);
                }

diff --git a/usr/src/sys/ufs/lfs/lfs_inode.c b/usr/src/sys/ufs/lfs/lfs_inode.c
index 539e0c3..8525d4c 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_inode.c
+++ b/usr/src/sys/ufs/lfs/lfs_inode.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

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

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


@@ -483,7 +483,7 @@ itrunc(oip, length)
                            indirtrunc(ip, bn, lastiblock[level], level);
                        if (lastiblock[level] < 0) {
                                ip->i_ib[level] = 0;
                            indirtrunc(ip, bn, lastiblock[level], level);
                        if (lastiblock[level] < 0) {
                                ip->i_ib[level] = 0;

-                               free(ip, bn, (off_t)fs->fs_bsize);
+                               blkfree(ip, bn, (off_t)fs->fs_bsize);

                                blocksreleased += nblocks;
                        }
                }
                                blocksreleased += nblocks;
                        }
                }


@@ -502,7 +502,7 @@ itrunc(oip, length)
                        continue;
                ip->i_db[i] = 0;
                bsize = (off_t)blksize(fs, ip, i);
                        continue;
                ip->i_db[i] = 0;
                bsize = (off_t)blksize(fs, ip, i);

-               free(ip, bn, bsize);
+               blkfree(ip, bn, bsize);

                blocksreleased += btodb(bsize);
        }
        if (lastblock < 0)
                blocksreleased += btodb(bsize);
        }
        if (lastblock < 0)


@@ -532,7 +532,7 @@ itrunc(oip, length)
                         * required for the storage we're keeping.
                         */
                        bn += numfrags(fs, newspace);
                         * required for the storage we're keeping.
                         */
                        bn += numfrags(fs, newspace);

-                       free(ip, bn, oldspace - newspace);
+                       blkfree(ip, bn, oldspace - newspace);

                        blocksreleased += btodb(oldspace - newspace);
                }
        }
                        blocksreleased += btodb(oldspace - newspace);
                }
        }


@@ -624,7 +624,7 @@ indirtrunc(ip, bn, lastbn, level)
                if (level > SINGLE)
                        blocksreleased +=
                            indirtrunc(ip, nb, (daddr_t)-1, level - 1);
                if (level > SINGLE)
                        blocksreleased +=
                            indirtrunc(ip, nb, (daddr_t)-1, level - 1);

-               free(ip, nb, (off_t)fs->fs_bsize);
+               blkfree(ip, nb, (off_t)fs->fs_bsize);

                blocksreleased += nblocks;
        }
 
                blocksreleased += nblocks;
        }
 

diff --git a/usr/src/sys/ufs/ufs/ufs_inode.c b/usr/src/sys/ufs/ufs/ufs_inode.c
index e8de953..c97d867 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_inode.c
+++ b/usr/src/sys/ufs/ufs/ufs_inode.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

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

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


@@ -483,7 +483,7 @@ itrunc(oip, length)
                            indirtrunc(ip, bn, lastiblock[level], level);
                        if (lastiblock[level] < 0) {
                                ip->i_ib[level] = 0;
                            indirtrunc(ip, bn, lastiblock[level], level);
                        if (lastiblock[level] < 0) {
                                ip->i_ib[level] = 0;

-                               free(ip, bn, (off_t)fs->fs_bsize);
+                               blkfree(ip, bn, (off_t)fs->fs_bsize);

                                blocksreleased += nblocks;
                        }
                }
                                blocksreleased += nblocks;
                        }
                }


@@ -502,7 +502,7 @@ itrunc(oip, length)
                        continue;
                ip->i_db[i] = 0;
                bsize = (off_t)blksize(fs, ip, i);
                        continue;
                ip->i_db[i] = 0;
                bsize = (off_t)blksize(fs, ip, i);

-               free(ip, bn, bsize);
+               blkfree(ip, bn, bsize);

                blocksreleased += btodb(bsize);
        }
        if (lastblock < 0)
                blocksreleased += btodb(bsize);
        }
        if (lastblock < 0)


@@ -532,7 +532,7 @@ itrunc(oip, length)
                         * required for the storage we're keeping.
                         */
                        bn += numfrags(fs, newspace);
                         * required for the storage we're keeping.
                         */
                        bn += numfrags(fs, newspace);

-                       free(ip, bn, oldspace - newspace);
+                       blkfree(ip, bn, oldspace - newspace);

                        blocksreleased += btodb(oldspace - newspace);
                }
        }
                        blocksreleased += btodb(oldspace - newspace);
                }
        }


@@ -624,7 +624,7 @@ indirtrunc(ip, bn, lastbn, level)
                if (level > SINGLE)
                        blocksreleased +=
                            indirtrunc(ip, nb, (daddr_t)-1, level - 1);
                if (level > SINGLE)
                        blocksreleased +=
                            indirtrunc(ip, nb, (daddr_t)-1, level - 1);

-               free(ip, nb, (off_t)fs->fs_bsize);
+               blkfree(ip, nb, (off_t)fs->fs_bsize);

                blocksreleased += nblocks;
        }
 
                blocksreleased += nblocks;
        }