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

Commit b64335f2 authored by David Woodhouse's avatar David Woodhouse
Browse files

[JFFS2] Add length argument to jffs2_add_physical_node_ref() 



If __totlen is going away, we need to pass the length in separately.
Also stop callers from needlessly setting ref->next_phys to NULL,
since that's done for them... and since that'll also be going away soon.

Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent 49f11d40

fs/jffs2/gc.c

+2 −4
Original line number Diff line number Diff line
@@ -627,8 +627,6 @@ static int jffs2_garbage_collect_pristine(struct jffs2_sb_info *c, 
	/* OK, all the CRCs are good; this node can just be copied as-is. */

 retry:

	nraw->flash_offset = phys_ofs;

	nraw->__totlen = rawlen;

	nraw->next_phys = NULL;



	ret = jffs2_flash_write(c, phys_ofs, rawlen, &retlen, (char *)node);
@@ -640,7 +638,7 @@ static int jffs2_garbage_collect_pristine(struct jffs2_sb_info *c, 
			nraw->next_in_ino = NULL;



			nraw->flash_offset |= REF_OBSOLETE;

			jffs2_add_physical_node_ref(c, nraw);

			jffs2_add_physical_node_ref(c, nraw, rawlen);

			jffs2_mark_node_obsolete(c, nraw);

		} else {

			printk(KERN_NOTICE "Not marking the space at 0x%08x as dirty because the flash driver returned retlen zero\n", nraw->flash_offset);
@@ -680,7 +678,7 @@ static int jffs2_garbage_collect_pristine(struct jffs2_sb_info *c, 
		goto out_node;

	}

	nraw->flash_offset |= REF_PRISTINE;

	jffs2_add_physical_node_ref(c, nraw);

	jffs2_add_physical_node_ref(c, nraw, rawlen);



	if (ic) {

		/* Link into per-inode list. This is safe because of the ic

fs/jffs2/nodelist.h

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ int jffs2_reserve_space(struct jffs2_sb_info *c, uint32_t minsize, uint32_t *ofs 
			uint32_t *len, int prio, uint32_t sumsize);

int jffs2_reserve_space_gc(struct jffs2_sb_info *c, uint32_t minsize, uint32_t *ofs,

			uint32_t *len, uint32_t sumsize);

int jffs2_add_physical_node_ref(struct jffs2_sb_info *c, struct jffs2_raw_node_ref *new);

int jffs2_add_physical_node_ref(struct jffs2_sb_info *c, struct jffs2_raw_node_ref *new, uint32_t len);

void jffs2_complete_reservation(struct jffs2_sb_info *c);

void jffs2_mark_node_obsolete(struct jffs2_sb_info *c, struct jffs2_raw_node_ref *raw);

fs/jffs2/nodemgmt.c

+2 −4
Original line number Diff line number Diff line
@@ -374,7 +374,6 @@ static int jffs2_do_reserve_space(struct jffs2_sb_info *c, uint32_t minsize, uin 
 *	@c: superblock info

 *	@new: new node reference to add

 *	@len: length of this physical node

 *	@dirty: dirty flag for new node

 *

 *	Should only be used to report nodes for which space has been allocated

 *	by jffs2_reserve_space.
@@ -382,13 +381,12 @@ static int jffs2_do_reserve_space(struct jffs2_sb_info *c, uint32_t minsize, uin 
 *	Must be called with the alloc_sem held.

 */



int jffs2_add_physical_node_ref(struct jffs2_sb_info *c, struct jffs2_raw_node_ref *new)

int jffs2_add_physical_node_ref(struct jffs2_sb_info *c, struct jffs2_raw_node_ref *new, uint32_t len)

{

	struct jffs2_eraseblock *jeb;

	uint32_t len;



	jeb = &c->blocks[new->flash_offset / c->sector_size];

	len = ref_totlen(c, jeb, new);

	new->__totlen = len;



	D1(printk(KERN_DEBUG "jffs2_add_physical_node_ref(): Node at 0x%x(%d), size 0x%x\n", ref_offset(new), ref_flags(new), len));

#if 1

fs/jffs2/wbuf.c

+1 −3
Original line number Diff line number Diff line
@@ -312,11 +312,9 @@ static void jffs2_wbuf_recover(struct jffs2_sb_info *c) 
					return;



				raw2->flash_offset = ofs | REF_OBSOLETE;

				raw2->__totlen = ref_totlen(c, jeb, *first_raw);

				raw2->next_phys = NULL;

				raw2->next_in_ino = NULL;



				jffs2_add_physical_node_ref(c, raw2);

				jffs2_add_physical_node_ref(c, raw2, ref_totlen(c, jeb, *first_raw));

			}

			return;

		}

fs/jffs2/write.c

+4 −8
Original line number Diff line number Diff line
@@ -103,8 +103,6 @@ struct jffs2_full_dnode *jffs2_write_dnode(struct jffs2_sb_info *c, struct jffs2 
	fn->raw = raw;



	raw->flash_offset = flash_ofs;

	raw->__totlen = PAD(sizeof(*ri)+datalen);

	raw->next_phys = NULL;



	if ((alloc_mode!=ALLOC_GC) && (je32_to_cpu(ri->version) < f->highest_version)) {

		BUG_ON(!retried);
@@ -133,7 +131,7 @@ struct jffs2_full_dnode *jffs2_write_dnode(struct jffs2_sb_info *c, struct jffs2 
			   any node we write before the original intended end of

			   this node */

			raw->flash_offset |= REF_OBSOLETE;

			jffs2_add_physical_node_ref(c, raw);

			jffs2_add_physical_node_ref(c, raw, PAD(sizeof(*ri)+datalen));

			jffs2_mark_node_obsolete(c, raw);

		} else {

			printk(KERN_NOTICE "Not marking the space at 0x%08x as dirty because the flash driver returned retlen zero\n", raw->flash_offset);
@@ -191,7 +189,7 @@ struct jffs2_full_dnode *jffs2_write_dnode(struct jffs2_sb_info *c, struct jffs2 
	} else {

		raw->flash_offset |= REF_NORMAL;

	}

	jffs2_add_physical_node_ref(c, raw);

	jffs2_add_physical_node_ref(c, raw, PAD(sizeof(*ri)+datalen));



	/* Link into per-inode list */

	spin_lock(&c->erase_completion_lock);
@@ -259,8 +257,6 @@ struct jffs2_full_dirent *jffs2_write_dirent(struct jffs2_sb_info *c, struct jff 
	fd->raw = raw;



	raw->flash_offset = flash_ofs;

	raw->__totlen = PAD(sizeof(*rd)+namelen);

	raw->next_phys = NULL;



	if ((alloc_mode!=ALLOC_GC) && (je32_to_cpu(rd->version) < f->highest_version)) {

		BUG_ON(!retried);
@@ -281,7 +277,7 @@ struct jffs2_full_dirent *jffs2_write_dirent(struct jffs2_sb_info *c, struct jff 
		if (retlen) {

			raw->next_in_ino = NULL;

			raw->flash_offset |= REF_OBSOLETE;

			jffs2_add_physical_node_ref(c, raw);

			jffs2_add_physical_node_ref(c, raw, PAD(sizeof(*rd)+namelen));

			jffs2_mark_node_obsolete(c, raw);

		} else {

			printk(KERN_NOTICE "Not marking the space at 0x%08x as dirty because the flash driver returned retlen zero\n", raw->flash_offset);
@@ -327,7 +323,7 @@ struct jffs2_full_dirent *jffs2_write_dirent(struct jffs2_sb_info *c, struct jff 
	}

	/* Mark the space used */

	raw->flash_offset |= REF_PRISTINE;

	jffs2_add_physical_node_ref(c, raw);

	jffs2_add_physical_node_ref(c, raw, PAD(sizeof(*rd)+namelen));



	spin_lock(&c->erase_completion_lock);

	raw->next_in_ino = f->inocache->nodes;