Skip to content

Commit

Permalink
fat: mark superblock as dirty less often
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Artem Bityutskiy authored and Linus Torvalds committed Jun 1, 2012
1 parent 90b4366 commit 330fe3c
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions fs/fat/fatent.c
Original file line number Diff line number Diff line change
Expand Up @@ -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++;
Expand All @@ -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))
Expand All @@ -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);
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -622,6 +621,8 @@ int fat_free_clusters(struct inode *inode, int cluster)
for (i = 0; i < nr_bhs; i++)
brelse(bhs[i]);
unlock_fat(sbi);
if (dirty_fsinfo)
mark_fsinfo_dirty(sb);

return err;
}
Expand Down

0 comments on commit 330fe3c

Please sign in to comment.