Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 23:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

JFFS2: Improve speed reading flash files

Browse source 
jffs2_1pass_read_inode() would read the entire data for each node
in the filesystem, regardless of whether it was part of the file
to be loaded or not. By only reading the header data for an inode,
and then reading the data only when it is found to be part of the
file to be loaded, much copying of data is saved.

jffs2_1pass_list_inodes() read each inode for every file in the
directory into a buffer. By using NULL as a buffer pointer, NOR
flash simply returns a pointer, and therefore avoids a memory copy.

Signed-off-by: Mark Tomlinson <mark.tomlinson@alliedtelesis.co.nz>
This commit is contained in:
Mark Tomlinson 2015-07-01 16:38:25 +12:00 committed by Tom Rini
parent 891224a5d8
commit 2d6d93a2dd
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
fs/jffs2/jffs2_1pass.c
View file

@ -735,8 +735,13 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 inode, char *dest)
#endif #endif
for (b = pL->frag.listHead; b != NULL; b = b->next) { for (b = pL->frag.listHead; b != NULL; b = b->next) {
jNode = (struct jffs2_raw_inode *) get_node_mem(b->offset, /*
pL->readbuf); * Copy just the node and not the data at this point,
* since we don't yet know if we need this data.
*/
jNode = (struct jffs2_raw_inode *)get_fl_mem(b->offset,
sizeof(struct jffs2_raw_inode),
pL->readbuf);
if (inode == jNode->ino) { if (inode == jNode->ino) {
#if 0 #if 0
putLabeledWord("\r\n\r\nread_inode: totlen = ", jNode->totlen); putLabeledWord("\r\n\r\nread_inode: totlen = ", jNode->totlen);
@ -760,7 +765,15 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 inode, char *dest)
#endif #endif
if(dest) { if(dest) {
src = ((uchar *) jNode) + sizeof(struct jffs2_raw_inode); /*
* Now that the inode has been checked,
* read the entire inode, including data.
*/
put_fl_mem(jNode, pL->readbuf);
jNode = (struct jffs2_raw_inode *)
get_node_mem(b->offset, pL->readbuf);
src = ((uchar *)jNode) +
sizeof(struct jffs2_raw_inode);
/* ignore data behind latest known EOF */ /* ignore data behind latest known EOF */
if (jNode->offset > totalSize) { if (jNode->offset > totalSize) {
put_fl_mem(jNode, pL->readbuf); put_fl_mem(jNode, pL->readbuf);
@ -967,7 +980,6 @@ jffs2_1pass_list_inodes(struct b_lists * pL, u32 pino)
pL->readbuf); pL->readbuf);
if (pino == jDir->pino) { if (pino == jDir->pino) {
u32 i_version = 0; u32 i_version = 0;
struct jffs2_raw_inode ojNode;
struct jffs2_raw_inode *jNode, *i = NULL; struct jffs2_raw_inode *jNode, *i = NULL;
struct b_node *b2; struct b_node *b2;
@ -1003,8 +1015,10 @@ jffs2_1pass_list_inodes(struct b_lists * pL, u32 pino)
for (b2 = pL->frag.listHead; b2; b2 = b2->next) { for (b2 = pL->frag.listHead; b2; b2 = b2->next) {
jNode = (struct jffs2_raw_inode *) jNode = (struct jffs2_raw_inode *)
get_fl_mem(b2->offset, sizeof(ojNode), &ojNode); get_fl_mem(b2->offset, sizeof(*jNode),
if (jNode->ino == jDir->ino && jNode->version >= i_version) { NULL);
if (jNode->ino == jDir->ino &&
jNode->version >= i_version) {
i_version = jNode->version; i_version = jNode->version;
if (i) if (i)
put_fl_mem(i, NULL); put_fl_mem(i, NULL);
@ -1017,6 +1031,7 @@ jffs2_1pass_list_inodes(struct b_lists * pL, u32 pino)
sizeof(*i), sizeof(*i),
NULL); NULL);
} }
put_fl_mem(jNode, NULL);
} }
dump_inode(pL, jDir, i); dump_inode(pL, jDir, i);