#ifdef CONFIG_YAFFS_YMALLOC_ALLOCATOR
-void yaffs_deinit_raw_tnodes_and_objs(yaffs_dev_t *dev)
+void yaffs_deinit_raw_tnodes_and_objs(struct yaffs_dev *dev)
{
dev = dev;
}
-void yaffs_init_raw_tnodes_and_objs(yaffs_dev_t *dev)
+void yaffs_init_raw_tnodes_and_objs(struct yaffs_dev *dev)
{
dev = dev;
}
-yaffs_tnode_t *yaffs_alloc_raw_tnode(yaffs_dev_t *dev)
+yaffs_tnode_t *yaffs_alloc_raw_tnode(struct yaffs_dev *dev)
{
return (yaffs_tnode_t *)YMALLOC(dev->tnode_size);
}
-void yaffs_free_raw_tnode(yaffs_dev_t *dev, yaffs_tnode_t *tn)
+void yaffs_free_raw_tnode(struct yaffs_dev *dev, yaffs_tnode_t *tn)
{
dev = dev;
YFREE(tn);
}
-void yaffs_init_raw_objs(yaffs_dev_t *dev)
+void yaffs_init_raw_objs(struct yaffs_dev *dev)
{
dev = dev;
}
-void yaffs_deinit_raw_objs(yaffs_dev_t *dev)
+void yaffs_deinit_raw_objs(struct yaffs_dev *dev)
{
dev = dev;
}
-yaffs_obj_t *yaffs_alloc_raw_obj(yaffs_dev_t *dev)
+struct yaffs_obj *yaffs_alloc_raw_obj(struct yaffs_dev *dev)
{
dev = dev;
- return (yaffs_obj_t *) YMALLOC(sizeof(yaffs_obj_t));
+ return (struct yaffs_obj *) YMALLOC(sizeof(struct yaffs_obj));
}
-void yaffs_free_raw_obj(yaffs_dev_t *dev, yaffs_obj_t *obj)
+void yaffs_free_raw_obj(struct yaffs_dev *dev, struct yaffs_obj *obj)
{
dev = dev;
typedef struct yaffs_tnode_list yaffs_tnodelist_t;
struct yaffs_obj_list_struct {
- yaffs_obj_t *objects;
+ struct yaffs_obj *objects;
struct yaffs_obj_list_struct *next;
};
typedef struct yaffs_obj_list_struct yaffs_obj_list;
-struct yaffs_AllocatorStruct {
- int n_tnodesCreated;
- yaffs_tnode_t *freeTnodes;
- int nFreeTnodes;
- yaffs_tnodelist_t *allocatedTnodeList;
+struct yaffs_allocator {
+ int n_tnodes_created;
+ yaffs_tnode_t *free_tnodes;
+ int n_free_tnodes;
+ yaffs_tnodelist_t *alloc_tnode_list;
- int n_objCreated;
- yaffs_obj_t *freeObjects;
- int nFreeObjects;
+ int n_obj_created;
+ struct yaffs_obj *free_objs;
+ int n_free_objects;
- yaffs_obj_list *allocated_list;
+ yaffs_obj_list *allocated_obj_list;
};
-typedef struct yaffs_AllocatorStruct yaffs_Allocator;
-
-static void yaffs_deinit_raw_tnodes(yaffs_dev_t *dev)
+static void yaffs_deinit_raw_tnodes(struct yaffs_dev *dev)
{
- yaffs_Allocator *allocator = (yaffs_Allocator *)dev->allocator;
+ struct yaffs_allocator *allocator = (struct yaffs_allocator *)dev->allocator;
yaffs_tnodelist_t *tmp;
return;
}
- while (allocator->allocatedTnodeList) {
- tmp = allocator->allocatedTnodeList->next;
+ while (allocator->alloc_tnode_list) {
+ tmp = allocator->alloc_tnode_list->next;
- YFREE(allocator->allocatedTnodeList->tnodes);
- YFREE(allocator->allocatedTnodeList);
- allocator->allocatedTnodeList = tmp;
+ YFREE(allocator->alloc_tnode_list->tnodes);
+ YFREE(allocator->alloc_tnode_list);
+ allocator->alloc_tnode_list = tmp;
}
- allocator->freeTnodes = NULL;
- allocator->nFreeTnodes = 0;
- allocator->n_tnodesCreated = 0;
+ allocator->free_tnodes = NULL;
+ allocator->n_free_tnodes = 0;
+ allocator->n_tnodes_created = 0;
}
-static void yaffs_init_raw_tnodes(yaffs_dev_t *dev)
+static void yaffs_init_raw_tnodes(struct yaffs_dev *dev)
{
- yaffs_Allocator *allocator = dev->allocator;
+ struct yaffs_allocator *allocator = dev->allocator;
if(allocator){
- allocator->allocatedTnodeList = NULL;
- allocator->freeTnodes = NULL;
- allocator->nFreeTnodes = 0;
- allocator->n_tnodesCreated = 0;
+ allocator->alloc_tnode_list = NULL;
+ allocator->free_tnodes = NULL;
+ allocator->n_free_tnodes = 0;
+ allocator->n_tnodes_created = 0;
} else
YBUG();
}
-static int yaffs_create_tnodes(yaffs_dev_t *dev, int n_tnodes)
+static int yaffs_create_tnodes(struct yaffs_dev *dev, int n_tnodes)
{
- yaffs_Allocator *allocator = (yaffs_Allocator *)dev->allocator;
+ struct yaffs_allocator *allocator = (struct yaffs_allocator *)dev->allocator;
int i;
- yaffs_tnode_t *newTnodes;
- __u8 *mem;
+ yaffs_tnode_t *new_tnodes;
+ u8 *mem;
yaffs_tnode_t *curr;
yaffs_tnode_t *next;
yaffs_tnodelist_t *tnl;
/* make these things */
- newTnodes = YMALLOC(n_tnodes * dev->tnode_size);
- mem = (__u8 *)newTnodes;
+ new_tnodes = YMALLOC(n_tnodes * dev->tnode_size);
+ mem = (u8 *)new_tnodes;
- if (!newTnodes) {
+ if (!new_tnodes) {
T(YAFFS_TRACE_ERROR,
(TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
return YAFFS_FAIL;
}
curr = (yaffs_tnode_t *) &mem[(n_tnodes - 1) * dev->tnode_size];
- curr->internal[0] = allocator->freeTnodes;
- allocator->freeTnodes = (yaffs_tnode_t *)mem;
+ curr->internal[0] = allocator->free_tnodes;
+ allocator->free_tnodes = (yaffs_tnode_t *)mem;
- allocator->nFreeTnodes += n_tnodes;
- allocator->n_tnodesCreated += n_tnodes;
+ allocator->n_free_tnodes += n_tnodes;
+ allocator->n_tnodes_created += n_tnodes;
/* Now add this bunch of tnodes to a list for freeing up.
* NB If we can't add this to the management list it isn't fatal
("yaffs: Could not add tnodes to management list" TENDSTR)));
return YAFFS_FAIL;
} else {
- tnl->tnodes = newTnodes;
- tnl->next = allocator->allocatedTnodeList;
- allocator->allocatedTnodeList = tnl;
+ tnl->tnodes = new_tnodes;
+ tnl->next = allocator->alloc_tnode_list;
+ allocator->alloc_tnode_list = tnl;
}
T(YAFFS_TRACE_ALLOCATE, (TSTR("yaffs: Tnodes added" TENDSTR)));
}
-yaffs_tnode_t *yaffs_alloc_raw_tnode(yaffs_dev_t *dev)
+yaffs_tnode_t *yaffs_alloc_raw_tnode(struct yaffs_dev *dev)
{
- yaffs_Allocator *allocator = (yaffs_Allocator *)dev->allocator;
+ struct yaffs_allocator *allocator = (struct yaffs_allocator *)dev->allocator;
yaffs_tnode_t *tn = NULL;
if(!allocator){
}
/* If there are none left make more */
- if (!allocator->freeTnodes)
+ if (!allocator->free_tnodes)
yaffs_create_tnodes(dev, YAFFS_ALLOCATION_NTNODES);
- if (allocator->freeTnodes) {
- tn = allocator->freeTnodes;
- allocator->freeTnodes = allocator->freeTnodes->internal[0];
- allocator->nFreeTnodes--;
+ if (allocator->free_tnodes) {
+ tn = allocator->free_tnodes;
+ allocator->free_tnodes = allocator->free_tnodes->internal[0];
+ allocator->n_free_tnodes--;
}
return tn;
}
/* FreeTnode frees up a tnode and puts it back on the free list */
-void yaffs_free_raw_tnode(yaffs_dev_t *dev, yaffs_tnode_t *tn)
+void yaffs_free_raw_tnode(struct yaffs_dev *dev, yaffs_tnode_t *tn)
{
- yaffs_Allocator *allocator = dev->allocator;
+ struct yaffs_allocator *allocator = dev->allocator;
if(!allocator){
YBUG();
}
if (tn) {
- tn->internal[0] = allocator->freeTnodes;
- allocator->freeTnodes = tn;
- allocator->nFreeTnodes++;
+ tn->internal[0] = allocator->free_tnodes;
+ allocator->free_tnodes = tn;
+ allocator->n_free_tnodes++;
}
dev->checkpoint_blocks_required = 0; /* force recalculation*/
}
-static void yaffs_init_raw_objs(yaffs_dev_t *dev)
+static void yaffs_init_raw_objs(struct yaffs_dev *dev)
{
- yaffs_Allocator *allocator = dev->allocator;
+ struct yaffs_allocator *allocator = dev->allocator;
if(allocator) {
- allocator->allocated_list = NULL;
- allocator->freeObjects = NULL;
- allocator->nFreeObjects = 0;
+ allocator->allocated_obj_list = NULL;
+ allocator->free_objs = NULL;
+ allocator->n_free_objects = 0;
} else
YBUG();
}
-static void yaffs_deinit_raw_objs(yaffs_dev_t *dev)
+static void yaffs_deinit_raw_objs(struct yaffs_dev *dev)
{
- yaffs_Allocator *allocator = dev->allocator;
+ struct yaffs_allocator *allocator = dev->allocator;
yaffs_obj_list *tmp;
if(!allocator){
return;
}
- while (allocator->allocated_list) {
- tmp = allocator->allocated_list->next;
- YFREE(allocator->allocated_list->objects);
- YFREE(allocator->allocated_list);
+ while (allocator->allocated_obj_list) {
+ tmp = allocator->allocated_obj_list->next;
+ YFREE(allocator->allocated_obj_list->objects);
+ YFREE(allocator->allocated_obj_list);
- allocator->allocated_list = tmp;
+ allocator->allocated_obj_list = tmp;
}
- allocator->freeObjects = NULL;
- allocator->nFreeObjects = 0;
- allocator->n_objCreated = 0;
+ allocator->free_objs = NULL;
+ allocator->n_free_objects = 0;
+ allocator->n_obj_created = 0;
}
-static int yaffs_create_free_objs(yaffs_dev_t *dev, int n_obj)
+static int yaffs_create_free_objs(struct yaffs_dev *dev, int n_obj)
{
- yaffs_Allocator *allocator = dev->allocator;
+ struct yaffs_allocator *allocator = dev->allocator;
int i;
- yaffs_obj_t *newObjects;
+ struct yaffs_obj *new_objs;
yaffs_obj_list *list;
if(!allocator){
return YAFFS_OK;
/* make these things */
- newObjects = YMALLOC(n_obj * sizeof(yaffs_obj_t));
+ new_objs = YMALLOC(n_obj * sizeof(struct yaffs_obj));
list = YMALLOC(sizeof(yaffs_obj_list));
- if (!newObjects || !list) {
- if (newObjects){
- YFREE(newObjects);
- newObjects = NULL;
+ if (!new_objs || !list) {
+ if (new_objs){
+ YFREE(new_objs);
+ new_objs = NULL;
}
if (list){
YFREE(list);
/* Hook them into the free list */
for (i = 0; i < n_obj - 1; i++) {
- newObjects[i].siblings.next =
- (struct ylist_head *)(&newObjects[i + 1]);
+ new_objs[i].siblings.next =
+ (struct ylist_head *)(&new_objs[i + 1]);
}
- newObjects[n_obj - 1].siblings.next = (void *)allocator->freeObjects;
- allocator->freeObjects = newObjects;
- allocator->nFreeObjects += n_obj;
- allocator->n_objCreated += n_obj;
+ new_objs[n_obj - 1].siblings.next = (void *)allocator->free_objs;
+ allocator->free_objs = new_objs;
+ allocator->n_free_objects += n_obj;
+ allocator->n_obj_created += n_obj;
/* Now add this bunch of Objects to a list for freeing up. */
- list->objects = newObjects;
- list->next = allocator->allocated_list;
- allocator->allocated_list = list;
+ list->objects = new_objs;
+ list->next = allocator->allocated_obj_list;
+ allocator->allocated_obj_list = list;
return YAFFS_OK;
}
-yaffs_obj_t *yaffs_alloc_raw_obj(yaffs_dev_t *dev)
+struct yaffs_obj *yaffs_alloc_raw_obj(struct yaffs_dev *dev)
{
- yaffs_obj_t *obj = NULL;
- yaffs_Allocator *allocator = dev->allocator;
+ struct yaffs_obj *obj = NULL;
+ struct yaffs_allocator *allocator = dev->allocator;
if(!allocator) {
YBUG();
}
/* If there are none left make more */
- if (!allocator->freeObjects)
+ if (!allocator->free_objs)
yaffs_create_free_objs(dev, YAFFS_ALLOCATION_NOBJECTS);
- if (allocator->freeObjects) {
- obj = allocator->freeObjects;
- allocator->freeObjects =
- (yaffs_obj_t *) (allocator->freeObjects->siblings.next);
- allocator->nFreeObjects--;
+ if (allocator->free_objs) {
+ obj = allocator->free_objs;
+ allocator->free_objs =
+ (struct yaffs_obj *) (allocator->free_objs->siblings.next);
+ allocator->n_free_objects--;
}
return obj;
}
-void yaffs_free_raw_obj(yaffs_dev_t *dev, yaffs_obj_t *obj)
+void yaffs_free_raw_obj(struct yaffs_dev *dev, struct yaffs_obj *obj)
{
- yaffs_Allocator *allocator = dev->allocator;
+ struct yaffs_allocator *allocator = dev->allocator;
if(!allocator)
YBUG();
else {
/* Link into the free list. */
- obj->siblings.next = (struct ylist_head *)(allocator->freeObjects);
- allocator->freeObjects = obj;
- allocator->nFreeObjects++;
+ obj->siblings.next = (struct ylist_head *)(allocator->free_objs);
+ allocator->free_objs = obj;
+ allocator->n_free_objects++;
}
}
-void yaffs_deinit_raw_tnodes_and_objs(yaffs_dev_t *dev)
+void yaffs_deinit_raw_tnodes_and_objs(struct yaffs_dev *dev)
{
if(dev->allocator){
yaffs_deinit_raw_tnodes(dev);
YBUG();
}
-void yaffs_init_raw_tnodes_and_objs(yaffs_dev_t *dev)
+void yaffs_init_raw_tnodes_and_objs(struct yaffs_dev *dev)
{
- yaffs_Allocator *allocator;
+ struct yaffs_allocator *allocator;
if(!dev->allocator){
- allocator = YMALLOC(sizeof(yaffs_Allocator));
+ allocator = YMALLOC(sizeof(struct yaffs_allocator));
if(allocator){
dev->allocator = allocator;
yaffs_init_raw_tnodes(dev);
projects / yaffs2.git / blobdiff