[JFFS2][XATTR] Remove 'struct list_head ilist' from jffs2_inode_cache.

This patch can reduce 4-byte of memory usage per inode_cache.

[4/10] jffs2-xattr-v5.1-04-remove_ilist_from_ic.patch

Signed-off-by: KaiGai Kohei <kaigai@ak.jp.nec.com>

diff --git a/fs/jffs2/jffs2_fs_sb.h b/fs/jffs2/jffs2_fs_sb.h
index 3b4e0ed..272fbea 100644 (file)
--- a/fs/jffs2/jffs2_fs_sb.h
+++ b/fs/jffs2/jffs2_fs_sb.h
@@ -119,8 +119,8 @@ struct jffs2_sb_info {
 #define XATTRINDEX_HASHSIZE    (57)
        uint32_t highest_xid;
        struct list_head xattrindex[XATTRINDEX_HASHSIZE];
-       struct list_head xattr_temp;
        struct list_head xattr_unchecked;
+       struct jffs2_xattr_ref *xref_temp;
        struct rw_semaphore xattr_sem;
        uint32_t xdatum_mem_usage;
        uint32_t xdatum_mem_threshold;

diff --git a/fs/jffs2/malloc.c b/fs/jffs2/malloc.c
index 3d5b7ec..f2473fa 100644 (file)
--- a/fs/jffs2/malloc.c
+++ b/fs/jffs2/malloc.c
@@ -259,7 +259,6 @@ struct jffs2_xattr_ref *jffs2_alloc_xattr_ref(void)
 
        memset(ref, 0, sizeof(struct jffs2_xattr_ref));
        ref->class = RAWNODE_CLASS_XATTR_REF;
-       INIT_LIST_HEAD(&ref->ilist);
        return ref;
 }
 

diff --git a/fs/jffs2/nodelist.h b/fs/jffs2/nodelist.h
index 6f6279c..351d947 100644 (file)
--- a/fs/jffs2/nodelist.h
+++ b/fs/jffs2/nodelist.h
@@ -117,7 +117,7 @@ struct jffs2_inode_cache {
        uint32_t ino;
        int nlink;
 #ifdef CONFIG_JFFS2_FS_XATTR
-       struct list_head ilist;
+       struct jffs2_xattr_ref *xref;
 #endif
 };
 

diff --cc fs/jffs2/readinode.c
Simple merge

diff --cc fs/jffs2/scan.c
Simple merge

diff --cc fs/jffs2/summary.c
Simple merge

diff --cc fs/jffs2/write.c
Simple merge

diff --cc fs/jffs2/xattr.c
Simple merge

diff --cc fs/jffs2/xattr.h
Simple merge