iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mtd: do not use mtd->sync directly

Browse Source 
This patch teaches 'mtd_sync()' to do nothing when the MTD driver does
not have the '->sync()' method, which allows us to remove all direct
'mtd->sync' accesses.

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-30 16:35:35 +02:00 committed by David Woodhouse
parent 1dbebd3256
commit 327cf2922b
9 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/mtd/ftl.c
View File

@ -650,8 +650,7 @@ static int reclaim_block(partition_t *part)
if (queued) { if (queued) {
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) 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)

7
drivers/mtd/mtdblock.c
View File

@ -322,8 +322,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) mtd_sync(mbd->mtd);
mtd_sync(mbd->mtd);
vfree(mtdblk->cache_data); vfree(mtdblk->cache_data);
} }
@ -341,9 +340,7 @@ static int mtdblock_flush(struct mtd_blktrans_dev *dev)
mutex_lock(&mtdblk->cache_mutex); mutex_lock(&mtdblk->cache_mutex);
write_cached_data(mtdblk); write_cached_data(mtdblk);
mutex_unlock(&mtdblk->cache_mutex); mutex_unlock(&mtdblk->cache_mutex);
mtd_sync(dev->mtd);
if (dev->mtd->sync)
mtd_sync(dev->mtd);
return 0; return 0;
} }

2
drivers/mtd/mtdchar.c
View File

@ -154,7 +154,7 @@ static int mtdchar_close(struct inode *inode, struct file *file)
pr_debug("MTD_close\n"); pr_debug("MTD_close\n");
/* 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); mtd_sync(mtd);
iput(mfi->ino); iput(mfi->ino);

3
drivers/mtd/mtdswap.c
View File

@ -1047,8 +1047,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) mtd_sync(d->mtd);
mtd_sync(d->mtd);
return 0; return 0;
} }

3
drivers/mtd/rfd_ftl.c
View File

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

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

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

4
fs/jffs2/super.c
View File

@ -336,9 +336,7 @@ static void jffs2_put_super (struct super_block *sb)
jffs2_flash_cleanup(c); jffs2_flash_cleanup(c);
kfree(c->inocache_list); kfree(c->inocache_list);
jffs2_clear_xattr_subsystem(c); jffs2_clear_xattr_subsystem(c);
if (c->mtd->sync) 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"));
} }

3
fs/logfs/dev_mtd.c
View File

@ -119,8 +119,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) 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)

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

@ -399,7 +399,8 @@ int mtd_writev(struct mtd_info *mtd, const struct kvec *vecs,
static inline void mtd_sync(struct mtd_info *mtd) static inline void mtd_sync(struct mtd_info *mtd)
{ {
mtd->sync(mtd); if (mtd->sync)
mtd->sync(mtd);
} }
/* Chip-supported device locking */ /* Chip-supported device locking */