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

Commit 4ccf2f13 authored by Artem Bityutskiy's avatar Artem Bityutskiy Committed by David Woodhouse
Browse files

jffs: remove custom mtd_fake_writev function 



Instead, use 'default_mtd_writev()' function which MTD provides.

Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent bac97277

fs/jffs2/writev.c

+1 −26
Original line number Diff line number Diff line
@@ -13,31 +13,6 @@ 
#include <linux/mtd/mtd.h>

#include "nodelist.h"



/* This ought to be in core MTD code. All registered MTD devices

   without writev should have this put in place. Bug the MTD

   maintainer */

static inline int mtd_fake_writev(struct mtd_info *mtd, const struct kvec *vecs,

				  unsigned long count, loff_t to, size_t *retlen)

{

	unsigned long i;

	size_t totlen = 0, thislen;

	int ret = 0;



	for (i=0; i<count; i++) {

		if (!vecs[i].iov_len)

			continue;

		ret = mtd_write(mtd, to, vecs[i].iov_len, &thislen,

				vecs[i].iov_base);

		totlen += thislen;

		if (ret || thislen != vecs[i].iov_len)

			break;

		to += vecs[i].iov_len;

	}

	if (retlen)

		*retlen = totlen;

	return ret;

}



int jffs2_flash_direct_writev(struct jffs2_sb_info *c, const struct kvec *vecs,

			      unsigned long count, loff_t to, size_t *retlen)

{
@@ -54,7 +29,7 @@ int jffs2_flash_direct_writev(struct jffs2_sb_info *c, const struct kvec *vecs, 
	if (c->mtd->writev)

		return mtd_writev(c->mtd, vecs, count, to, retlen);

	else {

		return mtd_fake_writev(c->mtd, vecs, count, to, retlen);

		return default_mtd_writev(c->mtd, vecs, count, to, retlen);

	}

}