Add support for vmallocing large blockInfos

diff --git a/yaffs_guts.c b/yaffs_guts.c
index 90aba83483df0745e8174e5e502c52bbdb507b68..eafbaa996e57054305f4104fa6c8003a00d26f9d 100644 (file)
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -13,7 +13,7 @@
  */
 
 const char *yaffs_guts_c_version =
  */
 
 const char *yaffs_guts_c_version =

-    "$Id: yaffs_guts.c,v 1.19 2005-09-20 05:08:50 charles Exp $";
+    "$Id: yaffs_guts.c,v 1.20 2005-10-07 02:46:49 charles Exp $";

 
 #include "yportenv.h"
 
 
 #include "yportenv.h"
 


@@ -1747,6 +1747,12 @@ static int yaffs_InitialiseBlocks(yaffs_Device * dev, int nBlocks)
 
        /* Todo we're assuming the malloc will pass. */
        dev->blockInfo = YMALLOC(nBlocks * sizeof(yaffs_BlockInfo));
 
        /* Todo we're assuming the malloc will pass. */
        dev->blockInfo = YMALLOC(nBlocks * sizeof(yaffs_BlockInfo));

+       if(!dev->blockInfo){
+               dev->blockInfo = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockInfo));
+               dev->blockInfoAlt = 1;
+       }
+       else
+               dev->blockInfoAlt = 0;

        
        /* Set up dynamic blockinfo stuff. */
        dev->chunkBitmapStride = (dev->nChunksPerBlock + 7) / 8;
        
        /* Set up dynamic blockinfo stuff. */
        dev->chunkBitmapStride = (dev->nChunksPerBlock + 7) / 8;


@@ -1763,7 +1769,12 @@ static int yaffs_InitialiseBlocks(yaffs_Device * dev, int nBlocks)
 
 static void yaffs_DeinitialiseBlocks(yaffs_Device * dev)
 {
 
 static void yaffs_DeinitialiseBlocks(yaffs_Device * dev)
 {

-       YFREE(dev->blockInfo);
+       if(dev->blockInfoAlt)
+               YFREE_ALT(dev->blockInfo);
+       else
+               YFREE(dev->blockInfo);
+       dev->blockInfoAlt = 0;
+

        dev->blockInfo = NULL;
        YFREE(dev->chunkBits);
        dev->chunkBits = NULL;
        dev->blockInfo = NULL;
        YFREE(dev->chunkBits);
        dev->chunkBits = NULL;

diff --git a/yaffs_guts.h b/yaffs_guts.h
index 535a2695d61dd4ba36026b42eadfee8f25dece78..c5eee97309a3d0ed6d8f4b90781bf5479fde676d 100644 (file)
--- a/yaffs_guts.h
+++ b/yaffs_guts.h
@@ -14,7 +14,7 @@
  *
  * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
  *
  *
  * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
  *

- * $Id: yaffs_guts.h,v 1.14 2005-09-20 05:05:40 charles Exp $
+ * $Id: yaffs_guts.h,v 1.15 2005-10-07 02:46:50 charles Exp $

  */
 
 #ifndef __YAFFS_GUTS_H__
  */
 
 #ifndef __YAFFS_GUTS_H__


@@ -561,6 +561,7 @@ struct yaffs_DeviceStruct {
 
        /* Block Info */
        yaffs_BlockInfo *blockInfo;
 
        /* Block Info */
        yaffs_BlockInfo *blockInfo;

+       int blockInfoAlt;       /* was allocated using alternative strategy */

        __u8 *chunkBits;        /* bitmap of chunks in use */
        int chunkBitmapStride;  /* Number of bytes of chunkBits per block. 
                                 * Must be consistent with nChunksPerBlock.
        __u8 *chunkBits;        /* bitmap of chunks in use */
        int chunkBitmapStride;  /* Number of bytes of chunkBits per block. 
                                 * Must be consistent with nChunksPerBlock.

diff --git a/yportenv.h b/yportenv.h
index 0543383066a0a24c1e3ef9f78051fde54cfb661f..240b6b95a1d2f350d0fab21530af64c83d35794e 100644 (file)
--- a/yportenv.h
+++ b/yportenv.h
@@ -15,7 +15,7 @@
  *
  * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
  *
  *
  * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
  *

- * $Id: yportenv.h,v 1.8 2005-09-18 05:31:26 marty Exp $
+ * $Id: yportenv.h,v 1.9 2005-10-07 02:46:50 charles Exp $

  *
  */
 
  *
  */
 


@@ -37,6 +37,7 @@
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/slab.h>

+#include <linux/vmalloc.h>

 
 #define YCHAR char
 #define YUCHAR unsigned char
 
 #define YCHAR char
 #define YUCHAR unsigned char


@@ -55,6 +56,8 @@
 /* #define YPRINTF(x) printk x */
 #define YMALLOC(x) kmalloc(x,GFP_KERNEL)
 #define YFREE(x)   kfree(x)
 /* #define YPRINTF(x) printk x */
 #define YMALLOC(x) kmalloc(x,GFP_KERNEL)
 #define YFREE(x)   kfree(x)

+#define YMALLOC_ALT(x) vmalloc(x)
+#define YFREE_ALT(x)   vfree(x)

 
 #define YAFFS_ROOT_MODE                                0666
 #define YAFFS_LOSTNFOUND_MODE          0666
 
 #define YAFFS_ROOT_MODE                                0666
 #define YAFFS_LOSTNFOUND_MODE          0666


@@ -91,6 +94,8 @@
 
 #define YMALLOC(x) malloc(x)
 #define YFREE(x)   free(x)
 
 #define YMALLOC(x) malloc(x)
 #define YFREE(x)   free(x)

+#define YMALLOC_ALT(x) malloc(x)
+#define YFREE_ALT(x) free(x)

 
 #define YCHAR char
 #define YUCHAR unsigned char
 
 #define YCHAR char
 #define YUCHAR unsigned char