lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mtd: introduce mtd_sync interface

Browse Source 
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 19:03:12 +02:00
committed by David Woodhouse
parent b0a31f7b2a
commit 85f2f2a809
11 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mtd/ftl.c
View File

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

4
drivers/mtd/mtdblock.c
View File

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

2
drivers/mtd/mtdchar.c
View File

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

2
drivers/mtd/mtdconcat.c
View File

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

2
drivers/mtd/mtdpart.c
View File

@@ -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) static void part_sync(struct mtd_info *mtd)
{ {
struct mtd_part *part = PART(mtd); struct mtd_part *part = PART(mtd);
part->master->sync(part->master); mtd_sync(part->master);
} }
static int part_suspend(struct mtd_info *mtd) static int part_suspend(struct mtd_info *mtd)

2
drivers/mtd/mtdswap.c
View File

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

2
drivers/mtd/rfd_ftl.c
View File

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

2
drivers/mtd/ubi/kapi.c
View File

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

2
fs/jffs2/super.c
View File

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

2
fs/logfs/dev_mtd.c
View File

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

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

@@ -206,15 +206,13 @@ struct mtd_info {
size_t len); size_t len);
int (*writev) (struct mtd_info *mtd, const struct kvec *vecs, int (*writev) (struct mtd_info *mtd, const struct kvec *vecs,
unsigned long count, loff_t to, size_t *retlen); unsigned long count, loff_t to, size_t *retlen);
void (*sync) (struct mtd_info *mtd);
/* 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;
/* Sync */
void (*sync) (struct mtd_info *mtd);
/* Chip-supported device locking */ /* Chip-supported device locking */
int (*lock) (struct mtd_info *mtd, loff_t ofs, uint64_t len); int (*lock) (struct mtd_info *mtd, loff_t ofs, uint64_t len);
int (*unlock) (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); 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) 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;