|
@@ -13,31 +13,6 @@
|
|
#include <linux/mtd/mtd.h>
|
|
#include <linux/mtd/mtd.h>
|
|
#include "nodelist.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,
|
|
int jffs2_flash_direct_writev(struct jffs2_sb_info *c, const struct kvec *vecs,
|
|
unsigned long count, loff_t to, size_t *retlen)
|
|
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)
|
|
if (c->mtd->writev)
|
|
return mtd_writev(c->mtd, vecs, count, to, retlen);
|
|
return mtd_writev(c->mtd, vecs, count, to, retlen);
|
|
else {
|
|
else {
|
|
- return mtd_fake_writev(c->mtd, vecs, count, to, retlen);
|
|
|
|
|
|
+ return default_mtd_writev(c->mtd, vecs, count, to, retlen);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|