Skip to content

Commit

Permalink
fat: Check s_dirt in fat_sync_fs()
Browse files Browse the repository at this point in the history
If we didn't check sb->s_dirt, it will update the FSINFO
unconditionally. It will reduce the filetime of flash base device.

So, this checks sb->s_dirt. sb->s_dirt is racy, however FSINFO is just
hint. So even if there is race, and we hit it, it would not become big
problem.

And this also is as workaround of suspend problem.

Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
  • Loading branch information
OGAWAHirofumi committed Sep 19, 2009
1 parent 9552347 commit ed248b2
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
2 changes: 1 addition & 1 deletion fs/fat/fat.h
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ extern int fat_flush_inodes(struct super_block *sb, struct inode *i1,
/* fat/misc.c */
extern void fat_fs_error(struct super_block *s, const char *fmt, ...)
__attribute__ ((format (printf, 2, 3))) __cold;
extern void fat_clusters_flush(struct super_block *sb);
extern int fat_clusters_flush(struct super_block *sb);
extern int fat_chain_add(struct inode *inode, int new_dclus, int nr_cluster);
extern void fat_time_fat2unix(struct msdos_sb_info *sbi, struct timespec *ts,
__le16 __time, __le16 __date, u8 time_cs);
Expand Down
14 changes: 9 additions & 5 deletions fs/fat/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -451,12 +451,16 @@ static void fat_write_super(struct super_block *sb)

static int fat_sync_fs(struct super_block *sb, int wait)
{
lock_super(sb);
fat_clusters_flush(sb);
sb->s_dirt = 0;
unlock_super(sb);
int err = 0;

return 0;
if (sb->s_dirt) {
lock_super(sb);
sb->s_dirt = 0;
err = fat_clusters_flush(sb);
unlock_super(sb);
}

return err;
}

static void fat_put_super(struct super_block *sb)
Expand Down
8 changes: 5 additions & 3 deletions fs/fat/misc.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,19 @@ EXPORT_SYMBOL_GPL(fat_fs_error);

/* Flushes the number of free clusters on FAT32 */
/* XXX: Need to write one per FSINFO block. Currently only writes 1 */
void fat_clusters_flush(struct super_block *sb)
int fat_clusters_flush(struct super_block *sb)
{
struct msdos_sb_info *sbi = MSDOS_SB(sb);
struct buffer_head *bh;
struct fat_boot_fsinfo *fsinfo;

if (sbi->fat_bits != 32)
return;
return 0;

bh = sb_bread(sb, sbi->fsinfo_sector);
if (bh == NULL) {
printk(KERN_ERR "FAT: bread failed in fat_clusters_flush\n");
return;
return -EIO;
}

fsinfo = (struct fat_boot_fsinfo *)bh->b_data;
Expand All @@ -74,6 +74,8 @@ void fat_clusters_flush(struct super_block *sb)
mark_buffer_dirty(bh);
}
brelse(bh);

return 0;
}

/*
Expand Down

0 comments on commit ed248b2

Please sign in to comment.