Commit 9fe4854c authored by David Woodhouse's avatar David Woodhouse
Browse files

[JFFS2] Remove flash offset argument from various functions. 



We don't need the upper layers to deal with the physical offset. It's
_always_ c->nextblock->offset + c->sector_size - c->nextblock->free_size
so we might as well just let the actual write functions deal with that.

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

fs/jffs2/dir.c

+20 −20
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ static int jffs2_symlink (struct inode *dir_i, struct dentry *dentry, const char 
	struct jffs2_full_dnode *fn;

	struct jffs2_full_dirent *fd;

	int namelen;

	uint32_t alloclen, phys_ofs;

	uint32_t alloclen;

	int ret, targetlen = strlen(target);



	/* FIXME: If you care. We'd need to use frags for the target
@@ -327,7 +327,7 @@ static int jffs2_symlink (struct inode *dir_i, struct dentry *dentry, const char 
	 * Just the node will do for now, though

	 */

	namelen = dentry->d_name.len;

	ret = jffs2_reserve_space(c, sizeof(*ri) + targetlen, &phys_ofs, &alloclen,

	ret = jffs2_reserve_space(c, sizeof(*ri) + targetlen, &alloclen,

				  ALLOC_NORMAL, JFFS2_SUMMARY_INODE_SIZE);



	if (ret) {
@@ -356,7 +356,7 @@ static int jffs2_symlink (struct inode *dir_i, struct dentry *dentry, const char 
	ri->data_crc = cpu_to_je32(crc32(0, target, targetlen));

	ri->node_crc = cpu_to_je32(crc32(0, ri, sizeof(*ri)-8));



	fn = jffs2_write_dnode(c, f, ri, target, targetlen, phys_ofs, ALLOC_NORMAL);

	fn = jffs2_write_dnode(c, f, ri, target, targetlen, ALLOC_NORMAL);



	jffs2_free_raw_inode(ri);
@@ -400,7 +400,7 @@ static int jffs2_symlink (struct inode *dir_i, struct dentry *dentry, const char 
		return ret;

	}



	ret = jffs2_reserve_space(c, sizeof(*rd)+namelen, &phys_ofs, &alloclen,

	ret = jffs2_reserve_space(c, sizeof(*rd)+namelen, &alloclen,

				  ALLOC_NORMAL, JFFS2_SUMMARY_DIRENT_SIZE(namelen));

	if (ret) {

		/* Eep. */
@@ -433,7 +433,7 @@ static int jffs2_symlink (struct inode *dir_i, struct dentry *dentry, const char 
	rd->node_crc = cpu_to_je32(crc32(0, rd, sizeof(*rd)-8));

	rd->name_crc = cpu_to_je32(crc32(0, dentry->d_name.name, namelen));



	fd = jffs2_write_dirent(c, dir_f, rd, dentry->d_name.name, namelen, phys_ofs, ALLOC_NORMAL);

	fd = jffs2_write_dirent(c, dir_f, rd, dentry->d_name.name, namelen, ALLOC_NORMAL);



	if (IS_ERR(fd)) {

		/* dirent failed to write. Delete the inode normally
@@ -471,7 +471,7 @@ static int jffs2_mkdir (struct inode *dir_i, struct dentry *dentry, int mode) 
	struct jffs2_full_dnode *fn;

	struct jffs2_full_dirent *fd;

	int namelen;

	uint32_t alloclen, phys_ofs;

	uint32_t alloclen;

	int ret;



	mode |= S_IFDIR;
@@ -486,7 +486,7 @@ static int jffs2_mkdir (struct inode *dir_i, struct dentry *dentry, int mode) 
	 * Just the node will do for now, though

	 */

	namelen = dentry->d_name.len;

	ret = jffs2_reserve_space(c, sizeof(*ri), &phys_ofs, &alloclen, ALLOC_NORMAL,

	ret = jffs2_reserve_space(c, sizeof(*ri), &alloclen, ALLOC_NORMAL,

				  JFFS2_SUMMARY_INODE_SIZE);



	if (ret) {
@@ -512,7 +512,7 @@ static int jffs2_mkdir (struct inode *dir_i, struct dentry *dentry, int mode) 
	ri->data_crc = cpu_to_je32(0);

	ri->node_crc = cpu_to_je32(crc32(0, ri, sizeof(*ri)-8));



	fn = jffs2_write_dnode(c, f, ri, NULL, 0, phys_ofs, ALLOC_NORMAL);

	fn = jffs2_write_dnode(c, f, ri, NULL, 0, ALLOC_NORMAL);



	jffs2_free_raw_inode(ri);
@@ -542,7 +542,7 @@ static int jffs2_mkdir (struct inode *dir_i, struct dentry *dentry, int mode) 
		return ret;

	}



	ret = jffs2_reserve_space(c, sizeof(*rd)+namelen, &phys_ofs, &alloclen,

	ret = jffs2_reserve_space(c, sizeof(*rd)+namelen, &alloclen,

				  ALLOC_NORMAL, JFFS2_SUMMARY_DIRENT_SIZE(namelen));

	if (ret) {

		/* Eep. */
@@ -575,7 +575,7 @@ static int jffs2_mkdir (struct inode *dir_i, struct dentry *dentry, int mode) 
	rd->node_crc = cpu_to_je32(crc32(0, rd, sizeof(*rd)-8));

	rd->name_crc = cpu_to_je32(crc32(0, dentry->d_name.name, namelen));



	fd = jffs2_write_dirent(c, dir_f, rd, dentry->d_name.name, namelen, phys_ofs, ALLOC_NORMAL);

	fd = jffs2_write_dirent(c, dir_f, rd, dentry->d_name.name, namelen, ALLOC_NORMAL);



	if (IS_ERR(fd)) {

		/* dirent failed to write. Delete the inode normally
@@ -631,7 +631,7 @@ static int jffs2_mknod (struct inode *dir_i, struct dentry *dentry, int mode, de 
	int namelen;

	union jffs2_device_node dev;

	int devlen = 0;

	uint32_t alloclen, phys_ofs;

	uint32_t alloclen;

	int ret;



	if (!new_valid_dev(rdev))
@@ -650,7 +650,7 @@ static int jffs2_mknod (struct inode *dir_i, struct dentry *dentry, int mode, de 
	 * Just the node will do for now, though

	 */

	namelen = dentry->d_name.len;

	ret = jffs2_reserve_space(c, sizeof(*ri) + devlen, &phys_ofs, &alloclen,

	ret = jffs2_reserve_space(c, sizeof(*ri) + devlen, &alloclen,

				  ALLOC_NORMAL, JFFS2_SUMMARY_INODE_SIZE);



	if (ret) {
@@ -678,7 +678,7 @@ static int jffs2_mknod (struct inode *dir_i, struct dentry *dentry, int mode, de 
	ri->data_crc = cpu_to_je32(crc32(0, &dev, devlen));

	ri->node_crc = cpu_to_je32(crc32(0, ri, sizeof(*ri)-8));



	fn = jffs2_write_dnode(c, f, ri, (char *)&dev, devlen, phys_ofs, ALLOC_NORMAL);

	fn = jffs2_write_dnode(c, f, ri, (char *)&dev, devlen, ALLOC_NORMAL);



	jffs2_free_raw_inode(ri);
@@ -708,7 +708,7 @@ static int jffs2_mknod (struct inode *dir_i, struct dentry *dentry, int mode, de 
		return ret;

	}



	ret = jffs2_reserve_space(c, sizeof(*rd)+namelen, &phys_ofs, &alloclen,

	ret = jffs2_reserve_space(c, sizeof(*rd)+namelen, &alloclen,

				  ALLOC_NORMAL, JFFS2_SUMMARY_DIRENT_SIZE(namelen));

	if (ret) {

		/* Eep. */
@@ -744,7 +744,7 @@ static int jffs2_mknod (struct inode *dir_i, struct dentry *dentry, int mode, de 
	rd->node_crc = cpu_to_je32(crc32(0, rd, sizeof(*rd)-8));

	rd->name_crc = cpu_to_je32(crc32(0, dentry->d_name.name, namelen));



	fd = jffs2_write_dirent(c, dir_f, rd, dentry->d_name.name, namelen, phys_ofs, ALLOC_NORMAL);

	fd = jffs2_write_dirent(c, dir_f, rd, dentry->d_name.name, namelen, ALLOC_NORMAL);



	if (IS_ERR(fd)) {

		/* dirent failed to write. Delete the inode normally

fs/jffs2/file.c

+4 −4
Original line number Diff line number Diff line
@@ -134,12 +134,12 @@ static int jffs2_prepare_write (struct file *filp, struct page *pg, 
		struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);

		struct jffs2_raw_inode ri;

		struct jffs2_full_dnode *fn;

		uint32_t phys_ofs, alloc_len;

		uint32_t alloc_len;



		D1(printk(KERN_DEBUG "Writing new hole frag 0x%x-0x%x between current EOF and new page\n",

			  (unsigned int)inode->i_size, pageofs));



		ret = jffs2_reserve_space(c, sizeof(ri), &phys_ofs, &alloc_len,

		ret = jffs2_reserve_space(c, sizeof(ri), &alloc_len,

					  ALLOC_NORMAL, JFFS2_SUMMARY_INODE_SIZE);

		if (ret)

			return ret;
@@ -166,7 +166,7 @@ static int jffs2_prepare_write (struct file *filp, struct page *pg, 
		ri.node_crc = cpu_to_je32(crc32(0, &ri, sizeof(ri)-8));

		ri.data_crc = cpu_to_je32(0);



		fn = jffs2_write_dnode(c, f, &ri, NULL, 0, phys_ofs, ALLOC_NORMAL);

		fn = jffs2_write_dnode(c, f, &ri, NULL, 0, ALLOC_NORMAL);



		if (IS_ERR(fn)) {

			ret = PTR_ERR(fn);

fs/jffs2/fs.c

+4 −4
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static int jffs2_do_setattr (struct inode *inode, struct iattr *iattr) 
	unsigned char *mdata = NULL;

	int mdatalen = 0;

	unsigned int ivalid;

	uint32_t phys_ofs, alloclen;

	uint32_t alloclen;

	int ret;

	D1(printk(KERN_DEBUG "jffs2_setattr(): ino #%lu\n", inode->i_ino));

	ret = inode_change_ok(inode, iattr);
@@ -79,7 +79,7 @@ static int jffs2_do_setattr (struct inode *inode, struct iattr *iattr) 
		return -ENOMEM;

	}



	ret = jffs2_reserve_space(c, sizeof(*ri) + mdatalen, &phys_ofs, &alloclen,

	ret = jffs2_reserve_space(c, sizeof(*ri) + mdatalen, &alloclen,

				  ALLOC_NORMAL, JFFS2_SUMMARY_INODE_SIZE);

	if (ret) {

		jffs2_free_raw_inode(ri);
@@ -131,7 +131,7 @@ static int jffs2_do_setattr (struct inode *inode, struct iattr *iattr) 
	else

		ri->data_crc = cpu_to_je32(0);



	new_metadata = jffs2_write_dnode(c, f, ri, mdata, mdatalen, phys_ofs, ALLOC_NORMAL);

	new_metadata = jffs2_write_dnode(c, f, ri, mdata, mdatalen, ALLOC_NORMAL);

	if (S_ISLNK(inode->i_mode))

		kfree(mdata);

fs/jffs2/gc.c

+17 −17
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ static int jffs2_garbage_collect_pristine(struct jffs2_sb_info *c, 
	if (ic && alloclen > sizeof(struct jffs2_raw_inode) + JFFS2_MIN_DATA_LEN)

		alloclen = sizeof(struct jffs2_raw_inode) + JFFS2_MIN_DATA_LEN;



	ret = jffs2_reserve_space_gc(c, alloclen, &phys_ofs, &alloclen, rawlen);

	ret = jffs2_reserve_space_gc(c, alloclen, &alloclen, rawlen);

	/* 'rawlen' is not the exact summary size; it is only an upper estimation */



	if (ret)
@@ -626,13 +626,13 @@ 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->flash_offset = phys_ofs = write_ofs(c);



	ret = jffs2_flash_write(c, phys_ofs, rawlen, &retlen, (char *)node);



	if (ret || (retlen != rawlen)) {

		printk(KERN_NOTICE "Write of %d bytes at 0x%08x failed. returned %d, retlen %zd\n",

                       rawlen, phys_ofs, ret, retlen);

                       rawlen, nraw->flash_offset, ret, retlen);

		if (retlen) {

			nraw->flash_offset |= REF_OBSOLETE;

			jffs2_add_physical_node_ref(c, nraw, rawlen, NULL);
@@ -653,7 +653,7 @@ static int jffs2_garbage_collect_pristine(struct jffs2_sb_info *c, 
			jffs2_dbg_acct_sanity_check(c,jeb);

			jffs2_dbg_acct_paranoia_check(c, jeb);



			ret = jffs2_reserve_space_gc(c, rawlen, &phys_ofs, &dummy, rawlen);

			ret = jffs2_reserve_space_gc(c, rawlen, &dummy, rawlen);

						/* this is not the exact summary size of it,

							it is only an upper estimation */
@@ -696,7 +696,7 @@ static int jffs2_garbage_collect_metadata(struct jffs2_sb_info *c, struct jffs2_ 
	struct jffs2_node_frag *last_frag;

	union jffs2_device_node dev;

	char *mdata = NULL, mdatalen = 0;

	uint32_t alloclen, phys_ofs, ilen;

	uint32_t alloclen, ilen;

	int ret;



	if (S_ISBLK(JFFS2_F_I_MODE(f)) ||
@@ -722,7 +722,7 @@ static int jffs2_garbage_collect_metadata(struct jffs2_sb_info *c, struct jffs2_ 


	}



	ret = jffs2_reserve_space_gc(c, sizeof(ri) + mdatalen, &phys_ofs, &alloclen,

	ret = jffs2_reserve_space_gc(c, sizeof(ri) + mdatalen, &alloclen,

				JFFS2_SUMMARY_INODE_SIZE);

	if (ret) {

		printk(KERN_WARNING "jffs2_reserve_space_gc of %zd bytes for garbage_collect_metadata failed: %d\n",
@@ -760,7 +760,7 @@ static int jffs2_garbage_collect_metadata(struct jffs2_sb_info *c, struct jffs2_ 
	ri.node_crc = cpu_to_je32(crc32(0, &ri, sizeof(ri)-8));

	ri.data_crc = cpu_to_je32(crc32(0, mdata, mdatalen));



	new_fn = jffs2_write_dnode(c, f, &ri, mdata, mdatalen, phys_ofs, ALLOC_GC);

	new_fn = jffs2_write_dnode(c, f, &ri, mdata, mdatalen, ALLOC_GC);



	if (IS_ERR(new_fn)) {

		printk(KERN_WARNING "Error writing new dnode: %ld\n", PTR_ERR(new_fn));
@@ -781,7 +781,7 @@ static int jffs2_garbage_collect_dirent(struct jffs2_sb_info *c, struct jffs2_er 
{

	struct jffs2_full_dirent *new_fd;

	struct jffs2_raw_dirent rd;

	uint32_t alloclen, phys_ofs;

	uint32_t alloclen;

	int ret;



	rd.magic = cpu_to_je16(JFFS2_MAGIC_BITMASK);
@@ -803,14 +803,14 @@ static int jffs2_garbage_collect_dirent(struct jffs2_sb_info *c, struct jffs2_er 
	rd.node_crc = cpu_to_je32(crc32(0, &rd, sizeof(rd)-8));

	rd.name_crc = cpu_to_je32(crc32(0, fd->name, rd.nsize));



	ret = jffs2_reserve_space_gc(c, sizeof(rd)+rd.nsize, &phys_ofs, &alloclen,

	ret = jffs2_reserve_space_gc(c, sizeof(rd)+rd.nsize, &alloclen,

				JFFS2_SUMMARY_DIRENT_SIZE(rd.nsize));

	if (ret) {

		printk(KERN_WARNING "jffs2_reserve_space_gc of %zd bytes for garbage_collect_dirent failed: %d\n",

		       sizeof(rd)+rd.nsize, ret);

		return ret;

	}

	new_fd = jffs2_write_dirent(c, f, &rd, fd->name, rd.nsize, phys_ofs, ALLOC_GC);

	new_fd = jffs2_write_dirent(c, f, &rd, fd->name, rd.nsize, ALLOC_GC);



	if (IS_ERR(new_fd)) {

		printk(KERN_WARNING "jffs2_write_dirent in garbage_collect_dirent failed: %ld\n", PTR_ERR(new_fd));
@@ -938,7 +938,7 @@ static int jffs2_garbage_collect_hole(struct jffs2_sb_info *c, struct jffs2_eras 
	struct jffs2_raw_inode ri;

	struct jffs2_node_frag *frag;

	struct jffs2_full_dnode *new_fn;

	uint32_t alloclen, phys_ofs, ilen;

	uint32_t alloclen, ilen;

	int ret;



	D1(printk(KERN_DEBUG "Writing replacement hole node for ino #%u from offset 0x%x to 0x%x\n",
@@ -1017,14 +1017,14 @@ static int jffs2_garbage_collect_hole(struct jffs2_sb_info *c, struct jffs2_eras 
	ri.data_crc = cpu_to_je32(0);

	ri.node_crc = cpu_to_je32(crc32(0, &ri, sizeof(ri)-8));



	ret = jffs2_reserve_space_gc(c, sizeof(ri), &phys_ofs, &alloclen,

	ret = jffs2_reserve_space_gc(c, sizeof(ri), &alloclen,

				     JFFS2_SUMMARY_INODE_SIZE);

	if (ret) {

		printk(KERN_WARNING "jffs2_reserve_space_gc of %zd bytes for garbage_collect_hole failed: %d\n",

		       sizeof(ri), ret);

		return ret;

	}

	new_fn = jffs2_write_dnode(c, f, &ri, NULL, 0, phys_ofs, ALLOC_GC);

	new_fn = jffs2_write_dnode(c, f, &ri, NULL, 0, ALLOC_GC);



	if (IS_ERR(new_fn)) {

		printk(KERN_WARNING "Error writing new hole node: %ld\n", PTR_ERR(new_fn));
@@ -1086,7 +1086,7 @@ static int jffs2_garbage_collect_dnode(struct jffs2_sb_info *c, struct jffs2_era 
{

	struct jffs2_full_dnode *new_fn;

	struct jffs2_raw_inode ri;

	uint32_t alloclen, phys_ofs, offset, orig_end, orig_start;

	uint32_t alloclen, offset, orig_end, orig_start;

	int ret = 0;

	unsigned char *comprbuf = NULL, *writebuf;

	unsigned long pg;
@@ -1243,7 +1243,7 @@ static int jffs2_garbage_collect_dnode(struct jffs2_sb_info *c, struct jffs2_era 
		uint32_t cdatalen;

		uint16_t comprtype = JFFS2_COMPR_NONE;



		ret = jffs2_reserve_space_gc(c, sizeof(ri) + JFFS2_MIN_DATA_LEN, &phys_ofs,

		ret = jffs2_reserve_space_gc(c, sizeof(ri) + JFFS2_MIN_DATA_LEN,

					&alloclen, JFFS2_SUMMARY_INODE_SIZE);



		if (ret) {
@@ -1280,7 +1280,7 @@ static int jffs2_garbage_collect_dnode(struct jffs2_sb_info *c, struct jffs2_era 
		ri.node_crc = cpu_to_je32(crc32(0, &ri, sizeof(ri)-8));

		ri.data_crc = cpu_to_je32(crc32(0, comprbuf, cdatalen));



		new_fn = jffs2_write_dnode(c, f, &ri, comprbuf, cdatalen, phys_ofs, ALLOC_GC);

		new_fn = jffs2_write_dnode(c, f, &ri, comprbuf, cdatalen, ALLOC_GC);



		jffs2_free_comprbuf(comprbuf, writebuf);

fs/jffs2/nodelist.h

+16 −7
Original line number Diff line number Diff line
@@ -167,6 +167,8 @@ struct jffs2_inode_cache { 


#define INOCACHE_HASHSIZE 128



#define write_ofs(c) ((c)->nextblock->offset + (c)->sector_size - (c)->nextblock->free_size)



/*

  Larger representation of a raw node, kept in-core only when the

  struct inode for this particular ino is instantiated.
@@ -325,9 +327,9 @@ extern uint32_t __jffs2_ref_totlen(struct jffs2_sb_info *c, 


/* nodemgmt.c */

int jffs2_thread_should_wake(struct jffs2_sb_info *c);

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

int jffs2_reserve_space(struct jffs2_sb_info *c, uint32_t minsize,

			uint32_t *len, int prio, uint32_t sumsize);

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

int jffs2_reserve_space_gc(struct jffs2_sb_info *c, uint32_t minsize,

			uint32_t *len, uint32_t sumsize);

int jffs2_add_physical_node_ref(struct jffs2_sb_info *c, 

				struct jffs2_raw_node_ref *new,
@@ -339,14 +341,21 @@ void jffs2_mark_node_obsolete(struct jffs2_sb_info *c, struct jffs2_raw_node_ref 
/* write.c */

int jffs2_do_new_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, uint32_t mode, struct jffs2_raw_inode *ri);



struct jffs2_full_dnode *jffs2_write_dnode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, struct jffs2_raw_inode *ri, const unsigned char *data, uint32_t datalen, uint32_t flash_ofs, int alloc_mode);

struct jffs2_full_dirent *jffs2_write_dirent(struct jffs2_sb_info *c, struct jffs2_inode_info *f, struct jffs2_raw_dirent *rd, const unsigned char *name, uint32_t namelen, uint32_t flash_ofs, int alloc_mode);

struct jffs2_full_dnode *jffs2_write_dnode(struct jffs2_sb_info *c, struct jffs2_inode_info *f,

					   struct jffs2_raw_inode *ri, const unsigned char *data,

					   uint32_t datalen, int alloc_mode);

struct jffs2_full_dirent *jffs2_write_dirent(struct jffs2_sb_info *c, struct jffs2_inode_info *f,

					     struct jffs2_raw_dirent *rd, const unsigned char *name,

					     uint32_t namelen, int alloc_mode);

int jffs2_write_inode_range(struct jffs2_sb_info *c, struct jffs2_inode_info *f,

			    struct jffs2_raw_inode *ri, unsigned char *buf,

			    uint32_t offset, uint32_t writelen, uint32_t *retlen);

int jffs2_do_create(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, struct jffs2_inode_info *f, struct jffs2_raw_inode *ri, const char *name, int namelen);

int jffs2_do_unlink(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, const char *name, int namelen, struct jffs2_inode_info *dead_f, uint32_t time);

int jffs2_do_link (struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, uint32_t ino, uint8_t type, const char *name, int namelen, uint32_t time);

int jffs2_do_create(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, struct jffs2_inode_info *f,

		    struct jffs2_raw_inode *ri, const char *name, int namelen);

int jffs2_do_unlink(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, const char *name,

		    int namelen, struct jffs2_inode_info *dead_f, uint32_t time);

int jffs2_do_link(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, uint32_t ino,

		   uint8_t type, const char *name, int namelen, uint32_t time);





/* readinode.c */

CRA Git | Maintained and supported by SUSTech CRA and CCSE