Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9f700f8 authored by KaiGai Kohei's avatar KaiGai Kohei Committed by David Woodhouse
Browse files

[JFFS2][XATTR] using 'delete marker' for xdatum/xref deletion 



- When xdatum is removed, a new xdatum with 'delete marker' is
  written. (version==0xffffffff means 'delete marker')
- When xref is removed, a new xref with 'delete marker' is written.
  (odd-numbered xseqno means 'delete marker')

- delete_xattr_(datum/xref)_delay() are new deletion functions
  are added. We can only use them if we can detect the target
  obsolete xdatum/xref as a orphan or errir one.
  (e.g when inode deletion, or detecting crc error)

[1/3] jffs2-xattr-v6-01-delete_marker.patch

Signed-off-by: default avatarKaiGai Kohei <kaigai@ak.jp.nec.com>
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent 6d4f8224

fs/jffs2/erase.c

+15 −4
Original line number Diff line number Diff line
@@ -230,7 +230,6 @@ static inline void jffs2_remove_node_refs_from_ino_list(struct jffs2_sb_info *c, 
			   at the end of the linked list. Stash it and continue

			   from the beginning of the list */

			ic = (struct jffs2_inode_cache *)(*prev);

			BUG_ON(ic->class != RAWNODE_CLASS_INODE_CACHE);

			prev = &ic->nodes;

			continue;

		}
@@ -254,7 +253,8 @@ static inline void jffs2_remove_node_refs_from_ino_list(struct jffs2_sb_info *c, 


	/* PARANOIA */

	if (!ic) {

		printk(KERN_WARNING "inode_cache not found in remove_node_refs()!!\n");

		JFFS2_WARNING("inode_cache/xattr_datum/xattr_ref"

			      " not found in remove_node_refs()!!\n");

		return;

	}
@@ -279,9 +279,20 @@ static inline void jffs2_remove_node_refs_from_ino_list(struct jffs2_sb_info *c, 
		printk("\n");

	});



	switch (ic->class) {

#ifdef CONFIG_JFFS2_FS_XATTR

		case RAWNODE_CLASS_XATTR_DATUM:

			jffs2_release_xattr_datum(c, (struct jffs2_xattr_datum *)ic);

			break;

		case RAWNODE_CLASS_XATTR_REF:

			jffs2_release_xattr_ref(c, (struct jffs2_xattr_ref *)ic);

			break;

#endif

		default:

			if (ic->nodes == (void *)ic && ic->nlink == 0)

				jffs2_del_ino_cache(c, ic);

	}

}



void jffs2_free_jeb_node_refs(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb)

{

fs/jffs2/gc.c

+2 −3
Original line number Diff line number Diff line
@@ -275,13 +275,12 @@ int jffs2_garbage_collect_pass(struct jffs2_sb_info *c) 
	 * We can decide whether this node is inode or xattr by ic->class.     */

	if (ic->class == RAWNODE_CLASS_XATTR_DATUM

	    || ic->class == RAWNODE_CLASS_XATTR_REF) {

		BUG_ON(raw->next_in_ino != (void *)ic);

		spin_unlock(&c->erase_completion_lock);



		if (ic->class == RAWNODE_CLASS_XATTR_DATUM) {

			ret = jffs2_garbage_collect_xattr_datum(c, (struct jffs2_xattr_datum *)ic);

			ret = jffs2_garbage_collect_xattr_datum(c, (struct jffs2_xattr_datum *)ic, raw);

		} else {

			ret = jffs2_garbage_collect_xattr_ref(c, (struct jffs2_xattr_ref *)ic);

			ret = jffs2_garbage_collect_xattr_ref(c, (struct jffs2_xattr_ref *)ic, raw);

		}

		goto release_sem;

	}

fs/jffs2/jffs2_fs_sb.h

+3 −0
Original line number Diff line number Diff line
@@ -119,8 +119,11 @@ struct jffs2_sb_info { 
#ifdef CONFIG_JFFS2_FS_XATTR

#define XATTRINDEX_HASHSIZE	(57)

	uint32_t highest_xid;

	uint32_t highest_xseqno;

	struct list_head xattrindex[XATTRINDEX_HASHSIZE];

	struct list_head xattr_unchecked;

	struct list_head xattr_dead_list;

	struct jffs2_xattr_ref *xref_dead_list;

	struct jffs2_xattr_ref *xref_temp;

	struct rw_semaphore xattr_sem;

	uint32_t xdatum_mem_usage;

fs/jffs2/malloc.c

+2 −0
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@ struct jffs2_xattr_datum *jffs2_alloc_xattr_datum(void) 


	memset(xd, 0, sizeof(struct jffs2_xattr_datum));

	xd->class = RAWNODE_CLASS_XATTR_DATUM;

	xd->node = (void *)xd;

	INIT_LIST_HEAD(&xd->xindex);

	return xd;

}
@@ -309,6 +310,7 @@ struct jffs2_xattr_ref *jffs2_alloc_xattr_ref(void) 


	memset(ref, 0, sizeof(struct jffs2_xattr_ref));

	ref->class = RAWNODE_CLASS_XATTR_REF;

	ref->node = (void *)ref;

	return ref;

}

fs/jffs2/nodemgmt.c

+14 −7
Original line number Diff line number Diff line
@@ -684,19 +684,26 @@ void jffs2_mark_node_obsolete(struct jffs2_sb_info *c, struct jffs2_raw_node_ref 
		spin_lock(&c->erase_completion_lock);



		ic = jffs2_raw_ref_to_ic(ref);

		/* It seems we should never call jffs2_mark_node_obsolete() for

		   XATTR nodes.... yet. Make sure we notice if/when we change

		   that :) */

		BUG_ON(ic->class != RAWNODE_CLASS_INODE_CACHE);

		for (p = &ic->nodes; (*p) != ref; p = &((*p)->next_in_ino))

			;



		*p = ref->next_in_ino;

		ref->next_in_ino = NULL;



		switch (ic->class) {

#ifdef CONFIG_JFFS2_FS_XATTR

			case RAWNODE_CLASS_XATTR_DATUM:

				jffs2_release_xattr_datum(c, (struct jffs2_xattr_datum *)ic);

				break;

			case RAWNODE_CLASS_XATTR_REF:

				jffs2_release_xattr_ref(c, (struct jffs2_xattr_ref *)ic);

				break;

#endif

			default:

				if (ic->nodes == (void *)ic && ic->nlink == 0)

					jffs2_del_ino_cache(c, ic);



				break;

		}

		spin_unlock(&c->erase_completion_lock);

	}