projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finished the 32 and 64 bit tests.
[yaffs2.git]
/
patches
/
yaffs_linux_allocator.c
diff --git
a/patches/yaffs_linux_allocator.c
b/patches/yaffs_linux_allocator.c
index 395f4eac548953198785806e66c7dd8bf2045d5f..aa181fb3e969f688e7d216e939c0b23c06c5dafe 100644
(file)
--- a/
patches/yaffs_linux_allocator.c
+++ b/
patches/yaffs_linux_allocator.c
@@
-1,8
+1,7
@@
/*
* YAFFS: Yet another Flash File System . A NAND-flash specific file system.
*
/*
* YAFFS: Yet another Flash File System . A NAND-flash specific file system.
*
- * Copyright (C) 2002-2010 Aleph One Ltd.
- * for Toby Churchill Ltd and Brightstar Engineering
+ * Copyright (C) 2002-2018 Aleph One Ltd.
*
* Created by Charles Manning <charles@aleph1.co.uk>
*
*
* Created by Charles Manning <charles@aleph1.co.uk>
*
@@
-55,7
+54,7
@@
void yaffs_deinit_raw_tnodes_and_objs(struct yaffs_dev *dev)
} else {
T(YAFFS_TRACE_ALWAYS,
(TSTR("NULL tnode cache\n")));
} else {
T(YAFFS_TRACE_ALWAYS,
(TSTR("NULL tnode cache\n")));
-
Y
BUG();
+ BUG();
}
if(allocator->object_cache){
}
if(allocator->object_cache){
@@
-64,7
+63,7
@@
void yaffs_deinit_raw_tnodes_and_objs(struct yaffs_dev *dev)
} else {
T(YAFFS_TRACE_ALWAYS,
(TSTR("NULL object cache\n")));
} else {
T(YAFFS_TRACE_ALWAYS,
(TSTR("NULL object cache\n")));
-
Y
BUG();
+ BUG();
}
kfree(allocator);
}
kfree(allocator);
@@
-72,7
+71,7
@@
void yaffs_deinit_raw_tnodes_and_objs(struct yaffs_dev *dev)
} else {
T(YAFFS_TRACE_ALWAYS,
(TSTR("Deinitialising NULL allocator\n")));
} else {
T(YAFFS_TRACE_ALWAYS,
(TSTR("Deinitialising NULL allocator\n")));
-
Y
BUG();
+ BUG();
}
dev->allocator = NULL;
}
}
dev->allocator = NULL;
}
@@
-110,7
+109,7
@@
void yaffs_init_raw_tnodes_and_objs(struct yaffs_dev *dev)
T(YAFFS_TRACE_ALLOCATE,(TSTR("Initialising yaffs allocator\n")));
if(dev->allocator)
T(YAFFS_TRACE_ALLOCATE,(TSTR("Initialising yaffs allocator\n")));
if(dev->allocator)
-
Y
BUG();
+ BUG();
else if(mount_id >= 10){
T(YAFFS_TRACE_ALWAYS,(TSTR("Bad mount_id %u\n"),mount_id));
} else {
else if(mount_id >= 10){
T(YAFFS_TRACE_ALWAYS,(TSTR("Bad mount_id %u\n"),mount_id));
} else {
@@
-121,7
+120,7
@@
void yaffs_init_raw_tnodes_and_objs(struct yaffs_dev *dev)
if(!dev->allocator){
T(YAFFS_TRACE_ALWAYS,
(TSTR("yaffs allocator creation failed\n")));
if(!dev->allocator){
T(YAFFS_TRACE_ALWAYS,
(TSTR("yaffs allocator creation failed\n")));
-
Y
BUG();
+ BUG();
return;
}
return;
}
@@
-141,7
+140,7
@@
void yaffs_init_raw_tnodes_and_objs(struct yaffs_dev *dev)
else {
T(YAFFS_TRACE_ALWAYS,
(TSTR("yaffs cache creation failed\n")));
else {
T(YAFFS_TRACE_ALWAYS,
(TSTR("yaffs cache creation failed\n")));
-
Y
BUG();
+ BUG();
}
}
@@
-159,7
+158,7
@@
void yaffs_init_raw_tnodes_and_objs(struct yaffs_dev *dev)
else {
T(YAFFS_TRACE_ALWAYS,
(TSTR("yaffs cache creation failed\n")));
else {
T(YAFFS_TRACE_ALWAYS,
(TSTR("yaffs cache creation failed\n")));
-
Y
BUG();
+ BUG();
}
}
}
}
}
}
@@
-169,7
+168,7
@@
struct yaffs_tnode *yaffs_alloc_raw_tnode(struct yaffs_dev *dev)
{
yaffs_Allocator *allocator = dev->allocator;
if(!allocator || !allocator->tnode_cache){
{
yaffs_Allocator *allocator = dev->allocator;
if(!allocator || !allocator->tnode_cache){
-
Y
BUG();
+ BUG();
return NULL;
}
return kmem_cache_alloc(allocator->tnode_cache, GFP_NOFS);
return NULL;
}
return kmem_cache_alloc(allocator->tnode_cache, GFP_NOFS);
@@
-185,11
+184,11
@@
struct yaffs_obj *yaffs_alloc_raw_obj(struct yaffs_dev *dev)
{
yaffs_Allocator *allocator = dev->allocator;
if(!allocator){
{
yaffs_Allocator *allocator = dev->allocator;
if(!allocator){
-
Y
BUG();
+ BUG();
return NULL;
}
if(!allocator->object_cache){
return NULL;
}
if(!allocator->object_cache){
-
Y
BUG();
+ BUG();
return NULL;
}
return kmem_cache_alloc(allocator->object_cache, GFP_NOFS);
return NULL;
}
return kmem_cache_alloc(allocator->object_cache, GFP_NOFS);