fat: mark superblock as dirty less often (330fe3c4) · Commits · 戴 / test

Preparation for further changes. It touches few functions in fatent.c and prevents them from marking the superblock as dirty unnecessarily often. Namely, instead of marking it as dirty in the internal tight loops - do it only once at the end of the functions. And instead of marking it as dirty while holding the FAT table lock, do it outside the lock. The reason for this patch is that marking the superblock as dirty will soon become a little bit heavier operation, so it is cleaner to do this only when it is necessary. Signed-off-by:

Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Cc: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

fs/fat/fatent.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -503,7 +503,6 @@ int fat_alloc_clusters(struct inode inode, int cluster, int nr_cluster)
		sbi->prev_free = entry;
		if (sbi->free_clusters != -1)
		sbi->free_clusters--;
		mark_fsinfo_dirty(sb);

		cluster[idx_clus] = entry;
		idx_clus++;
		@@ -525,11 +524,11 @@ int fat_alloc_clusters(struct inode inode, int cluster, int nr_cluster)
		/* Couldn't allocate the free entries */
		sbi->free_clusters = 0;
		sbi->free_clus_valid = 1;
		mark_fsinfo_dirty(sb);
		err = -ENOSPC;

		out:
		unlock_fat(sbi);
		mark_fsinfo_dirty(sb);
		fatent_brelse(&fatent);
		if (!err) {
		if (inode_needs_sync(inode))
		@@ -554,7 +553,7 @@ int fat_free_clusters(struct inode *inode, int cluster)
		struct fat_entry fatent;
		struct buffer_head *bhs[MAX_BUF_PER_PAGE];
		int i, err, nr_bhs;
		int first_cl = cluster;
		int first_cl = cluster, dirty_fsinfo = 0;

		nr_bhs = 0;
		fatent_init(&fatent);
		@@ -592,7 +591,7 @@ int fat_free_clusters(struct inode *inode, int cluster)
		ops->ent_put(&fatent, FAT_ENT_FREE);
		if (sbi->free_clusters != -1) {
		sbi->free_clusters++;
		mark_fsinfo_dirty(sb);
		dirty_fsinfo = 1;
		}

		if (nr_bhs + fatent.nr_bhs > MAX_BUF_PER_PAGE) {
		@@ -622,6 +621,8 @@ error:
		for (i = 0; i < nr_bhs; i++)
		brelse(bhs[i]);
		unlock_fat(sbi);
		if (dirty_fsinfo)
		mark_fsinfo_dirty(sb);

		return err;
		}

Admin message