yystopf
/
openharmony_kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!1060 LTS 补丁升级适配 

Merge pull request !1060 from gaochao/master
This commit is contained in:
openharmony_ci 2022-11-14 09:16:06 +00:00 committed by Gitee
parent efa336ab26 177f32283f
commit 4d1fd22b1c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/jffs2/jffs2.patch
View File

@ -3348,7 +3348,7 @@ diff -Nupr old/fs/jffs2/fs.c new/fs/jffs2/fs.c
{ {
/* /*
* Pick a inocache hash size based on the size of the medium. * Pick a inocache hash size based on the size of the medium.
@@ -510,117 +386,17 @@ static int calculate_inocache_hashsize(uint32_t flash_size) @@ -510,118 +386,17 @@ static int calculate_inocache_hashsize(uint32_t flash_size)
return hashsize; return hashsize;
} }
@ -3445,6 +3445,7 @@ diff -Nupr old/fs/jffs2/fs.c new/fs/jffs2/fs.c
- jffs2_free_raw_node_refs(c); - jffs2_free_raw_node_refs(c);
- kvfree(c->blocks); - kvfree(c->blocks);
- jffs2_clear_xattr_subsystem(c); - jffs2_clear_xattr_subsystem(c);
- jffs2_sum_exit(c);
- out_inohash: - out_inohash:
- kfree(c->inocache_list); - kfree(c->inocache_list);
- out_wbuf: - out_wbuf:
@ -3469,7 +3470,7 @@ diff -Nupr old/fs/jffs2/fs.c new/fs/jffs2/fs.c
struct jffs2_inode_cache *ic; struct jffs2_inode_cache *ic;
if (unlinked) { if (unlinked) {
@@ -668,72 +444,9 @@ struct jffs2_inode_info *jffs2_gc_fetch_inode(struct jffs2_sb_info *c, @@ -669,72 +444,9 @@ struct jffs2_inode_info *jffs2_gc_fetch_inode(struct jffs2_sb_info *c,
Just iget() it, and if read_inode() is necessary that's OK. Just iget() it, and if read_inode() is necessary that's OK.
*/ */
inode = jffs2_iget(OFNI_BS_2SFFJ(c), inum); inode = jffs2_iget(OFNI_BS_2SFFJ(c), inum);