Browse Source

mtd: introduce mtd_sync interface

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
master
Artem Bityutskiy 10 years ago
committed by David Woodhouse
parent
commit
85f2f2a809
  1. 2
      drivers/mtd/ftl.c
  2. 4
      drivers/mtd/mtdblock.c
  3. 2
      drivers/mtd/mtdchar.c
  4. 2
      drivers/mtd/mtdconcat.c
  5. 2
      drivers/mtd/mtdpart.c
  6. 2
      drivers/mtd/mtdswap.c
  7. 2
      drivers/mtd/rfd_ftl.c
  8. 2
      drivers/mtd/ubi/kapi.c
  9. 2
      fs/jffs2/super.c
  10. 2
      fs/logfs/dev_mtd.c
  11. 9
      include/linux/mtd/mtd.h

2
drivers/mtd/ftl.c

@ -651,7 +651,7 @@ static int reclaim_block(partition_t *part)
pr_debug("ftl_cs: waiting for transfer "
"unit to be prepared...\n");
if (part->mbd.mtd->sync)
part->mbd.mtd->sync(part->mbd.mtd);
mtd_sync(part->mbd.mtd);
} else {
static int ne = 0;
if (++ne < 5)

4
drivers/mtd/mtdblock.c

@ -323,7 +323,7 @@ static int mtdblock_release(struct mtd_blktrans_dev *mbd)
if (!--mtdblk->count) {
/* It was the last usage. Free the cache */
if (mbd->mtd->sync)
mbd->mtd->sync(mbd->mtd);
mtd_sync(mbd->mtd);
vfree(mtdblk->cache_data);
}
@ -343,7 +343,7 @@ static int mtdblock_flush(struct mtd_blktrans_dev *dev)
mutex_unlock(&mtdblk->cache_mutex);
if (dev->mtd->sync)
dev->mtd->sync(dev->mtd);
mtd_sync(dev->mtd);
return 0;
}

2
drivers/mtd/mtdchar.c

@ -155,7 +155,7 @@ static int mtdchar_close(struct inode *inode, struct file *file)
/* Only sync if opened RW */
if ((file->f_mode & FMODE_WRITE) && mtd->sync)
mtd->sync(mtd);
mtd_sync(mtd);
iput(mfi->ino);

2
drivers/mtd/mtdconcat.c

@ -620,7 +620,7 @@ static void concat_sync(struct mtd_info *mtd)
for (i = 0; i < concat->num_subdev; i++) {
struct mtd_info *subdev = concat->subdev[i];
subdev->sync(subdev);
mtd_sync(subdev);
}
}

2
drivers/mtd/mtdpart.c

@ -301,7 +301,7 @@ static int part_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len)
static void part_sync(struct mtd_info *mtd)
{
struct mtd_part *part = PART(mtd);
part->master->sync(part->master);
mtd_sync(part->master);
}
static int part_suspend(struct mtd_info *mtd)

2
drivers/mtd/mtdswap.c

@ -1048,7 +1048,7 @@ static int mtdswap_flush(struct mtd_blktrans_dev *dev)
struct mtdswap_dev *d = MTDSWAP_MBD_TO_MTDSWAP(dev);
if (d->mtd->sync)
d->mtd->sync(d->mtd);
mtd_sync(d->mtd);
return 0;
}

2
drivers/mtd/rfd_ftl.c

@ -449,7 +449,7 @@ static int reclaim_block(struct partition *part, u_long *old_sector)
/* we have a race if sync doesn't exist */
if (part->mbd.mtd->sync)
part->mbd.mtd->sync(part->mbd.mtd);
mtd_sync(part->mbd.mtd);
score = 0x7fffffff; /* MAX_INT */
best_block = -1;

2
drivers/mtd/ubi/kapi.c

@ -715,7 +715,7 @@ int ubi_sync(int ubi_num)
return -ENODEV;
if (ubi->mtd->sync)
ubi->mtd->sync(ubi->mtd);
mtd_sync(ubi->mtd);
ubi_put_device(ubi);
return 0;

2
fs/jffs2/super.c

@ -337,7 +337,7 @@ static void jffs2_put_super (struct super_block *sb)
kfree(c->inocache_list);
jffs2_clear_xattr_subsystem(c);
if (c->mtd->sync)
c->mtd->sync(c->mtd);
mtd_sync(c->mtd);
D1(printk(KERN_DEBUG "jffs2_put_super returning\n"));
}

2
fs/logfs/dev_mtd.c

@ -120,7 +120,7 @@ static void logfs_mtd_sync(struct super_block *sb)
struct mtd_info *mtd = logfs_super(sb)->s_mtd;
if (mtd->sync)
mtd->sync(mtd);
mtd_sync(mtd);
}
static int logfs_mtd_readpage(void *_sb, struct page *page)

9
include/linux/mtd/mtd.h

@ -206,15 +206,13 @@ struct mtd_info {
size_t len);
int (*writev) (struct mtd_info *mtd, const struct kvec *vecs,
unsigned long count, loff_t to, size_t *retlen);
void (*sync) (struct mtd_info *mtd);
/* Backing device capabilities for this device
* - provides mmap capabilities
*/
struct backing_dev_info *backing_dev_info;
/* Sync */
void (*sync) (struct mtd_info *mtd);
/* Chip-supported device locking */
int (*lock) (struct mtd_info *mtd, loff_t ofs, uint64_t len);
int (*unlock) (struct mtd_info *mtd, loff_t ofs, uint64_t len);
@ -381,6 +379,11 @@ static inline int mtd_writev(struct mtd_info *mtd, const struct kvec *vecs,
return mtd->writev(mtd, vecs, count, to, retlen);
}
static inline void mtd_sync(struct mtd_info *mtd)
{
mtd->sync(mtd);
}
static inline struct mtd_info *dev_to_mtd(struct device *dev)
{
return dev ? dev_get_drvdata(dev) : NULL;

Loading…
Cancel
Save