Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70d5098a authored by Alexander Stein's avatar Alexander Stein Committed by David Woodhouse
Browse files

mtd: mtdblock: call mtd_sync() only if opened for write 



Because it is useless to call it if the device is opened in R/O mode, and also
harmful: on CFI NOR flash it may block for long time waiting for erase
operations to complete is another partition with a R/W file-system on this
chip.

Artem Bityutskiy: write commit message, amend the patch to match the latest
tree (we use mtd_sync(), not mtd->sync() nowadays).

Signed-off-by: default avatarAlexander Stein <alexander.stein@systec-electronic.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 2ff5e153

drivers/mtd/mtd_blkdevs.c

+1 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ static int blktrans_open(struct block_device *bdev, fmode_t mode) 
	ret = __get_mtd_device(dev->mtd);

	if (ret)

		goto error_release;

	dev->file_mode = mode;



unlock:

	dev->open++;

drivers/mtd/mtdblock.c

+6 −2
Original line number Diff line number Diff line
@@ -321,7 +321,11 @@ static int mtdblock_release(struct mtd_blktrans_dev *mbd) 
	mutex_unlock(&mtdblk->cache_mutex);



	if (!--mtdblk->count) {

		/* It was the last usage. Free the cache */

		/*

		 * It was the last usage. Free the cache, but only sync if

		 * opened for writing.

		 */

		if (mbd->file_mode & FMODE_WRITE)

			mtd_sync(mbd->mtd);

		vfree(mtdblk->cache_data);

	}

include/linux/mtd/blktrans.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ struct mtd_blktrans_dev { 
	struct request_queue *rq;

	spinlock_t queue_lock;

	void *priv;

	fmode_t file_mode;

};



struct mtd_blktrans_ops {