hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mtd: introduce mtd_writev interface 

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Artem Bityutskiy 2011-12-23 18:59:12 +02:00 committed by David Woodhouse
parent 4403dbfb45
commit b0a31f7b2a
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/mtd/mtdconcat.c
View File

@ -227,8 +227,9 @@ concat_writev(struct mtd_info *mtd, const struct kvec *vecs,
if (!(subdev->flags & MTD_WRITEABLE)) if (!(subdev->flags & MTD_WRITEABLE))
err = -EROFS; err = -EROFS;
else else
err = subdev->writev(subdev, &vecs_copy[entry_low], err = mtd_writev(subdev, &vecs_copy[entry_low],
entry_high - entry_low + 1, to, &retsize); entry_high - entry_low + 1, to,
&retsize);
vecs_copy[entry_high].iov_len = old_iov_len - size; vecs_copy[entry_high].iov_len = old_iov_len - size;
vecs_copy[entry_high].iov_base += size; vecs_copy[entry_high].iov_base += size;

4
drivers/mtd/mtdpart.c
View File

@ -238,8 +238,8 @@ static int part_writev(struct mtd_info *mtd, const struct kvec *vecs,
struct mtd_part *part = PART(mtd); struct mtd_part *part = PART(mtd);
if (!(mtd->flags & MTD_WRITEABLE)) if (!(mtd->flags & MTD_WRITEABLE))
return -EROFS; return -EROFS;
return part->master->writev(part->master, vecs, count, return mtd_writev(part->master, vecs, count, to + part->offset,
to + part->offset, retlen); retlen);
} }
static int part_erase(struct mtd_info *mtd, struct erase_info *instr) static int part_erase(struct mtd_info *mtd, struct erase_info *instr)

2
fs/jffs2/writev.c
View File

@ -52,7 +52,7 @@ int jffs2_flash_direct_writev(struct jffs2_sb_info *c, const struct kvec *vecs,
} }
if (c->mtd->writev) if (c->mtd->writev)
return c->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 mtd_fake_writev(c->mtd, vecs, count, to, retlen);
} }

18
include/linux/mtd/mtd.h
View File

@ -204,18 +204,14 @@ struct mtd_info {
size_t *retlen, u_char *buf); size_t *retlen, u_char *buf);
int (*lock_user_prot_reg) (struct mtd_info *mtd, loff_t from, int (*lock_user_prot_reg) (struct mtd_info *mtd, loff_t from,
size_t len); size_t len);
int (*writev) (struct mtd_info *mtd, const struct kvec *vecs,
unsigned long count, loff_t to, size_t *retlen);
/* Backing device capabilities for this device /* Backing device capabilities for this device
* - provides mmap capabilities * - provides mmap capabilities
*/ */
struct backing_dev_info *backing_dev_info; struct backing_dev_info *backing_dev_info;
/* kvec-based read/write methods.
NB: The 'count' parameter is the number of _vectors_, each of
which contains an (ofs, len) tuple.
*/
int (*writev) (struct mtd_info *mtd, const struct kvec *vecs, unsigned long count, loff_t to, size_t *retlen);
/* Sync */ /* Sync */
void (*sync) (struct mtd_info *mtd); void (*sync) (struct mtd_info *mtd);
@ -375,6 +371,16 @@ static inline int mtd_lock_user_prot_reg(struct mtd_info *mtd, loff_t from,
return mtd->lock_user_prot_reg(mtd, from, len); return mtd->lock_user_prot_reg(mtd, from, len);
} }
/*
* kvec-based read/write method. NB: The 'count' parameter is the number of
* _vectors_, each of which contains an (ofs, len) tuple.
*/
static inline int mtd_writev(struct mtd_info *mtd, const struct kvec *vecs,
unsigned long count, loff_t to, size_t *retlen)
{
return mtd->writev(mtd, vecs, count, to, retlen);
}
static inline struct mtd_info *dev_to_mtd(struct device *dev) static inline struct mtd_info *dev_to_mtd(struct device *dev)
{ {
return dev ? dev_get_drvdata(dev) : NULL; return dev ? dev_get_drvdata(dev) : NULL;