mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 21:38:32 +08:00
Description for this pull request:
- Don't clear MediaFailure and VolumeDirty bit in volume flags
if these were already set before mounting.
- Write multiple dirty buffers at once in sync mode.
- Remove unneeded EXFAT_SB_DIRTY bit set.
-----BEGIN PGP SIGNATURE-----
iQJMBAABCgA2FiEE6NzKS6Uv/XAAGHgyZwv7A1FEIQgFAl8zgbYYHG5hbWphZS5q
ZW9uQHNhbXN1bmcuY29tAAoJEGcL+wNRRCEI8TkP/ROoQRwZSFM9NX0jtI5h6Mgs
MX7oLtMATKRewQkHtmJ4ZeFrDZhwrzZsvXifrxlt4XEQ/c2Jnl9x08lVCdc3NXaB
DM1hRwdLomztzBsLhmTSFvBczOMdY8+FVP6tOVgzCFKIs86pGBj2dekM9oYDw4jW
hDu5yfFtTB81CELuKZzSOwes3IRAtoK7RXGHHw/IXBzTdNT6LuShWgPU5cey99fB
ce9weKK8JrY7529h5wfTwfJN7Nh/G5+xtmbzjKSrkmb1XPy82KKYR8/SDIG03VNG
v1JL8VmI4rHUh8AmvwClt50GmeLMbrkko753xOuKOtcUorEYopXXbR2S7ApVzXPv
e6bpuWeV3kDPFhYsgtJQFgML9oZ+AiahHv2WTx0h5TX2cv0DuG4zBI3HhM/yRr0D
HDE3FO7qu9TT5OLQoLObIOwYnOu3uPtyHcas9UVM7ypyYlOTqWN3eXonBCYgoc7B
EicfRy/ayAmbxdq/DmMpzZ4ql/cxljjs/JGQdoURIDGNJvae68Y/SSnt4LIaV1Xu
sFS2b5shkASBMZTQe1FEr9FA07TXWlCMxcpcpLa6+iwIsQ2xWbKqrg/MwU7HiRsd
pNE87lS1JknF+LgXRt5+99fPFwnX0Oxh9Nedy8yvHl/Ozntzcsismj4ghXkDn44w
98ZulbX/WwTUqh2VdnpV
=85Zl
-----END PGP SIGNATURE-----
Merge tag 'exfat-for-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat
Pull exfat updates from Namjae Jeon:
- don't clear MediaFailure and VolumeDirty bit in volume flags if these
were already set before mounting
- write multiple dirty buffers at once in sync mode
- remove unneeded EXFAT_SB_DIRTY bit set
* tag 'exfat-for-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat:
exfat: retain 'VolumeFlags' properly
exfat: optimize exfat_zeroed_cluster()
exfat: add error check when updating dir-entries
exfat: write multiple sectors at once
exfat: remove EXFAT_SB_DIRTY flag
This commit is contained in:
Linus Torvalds
commit
ff419b61fd
@ -158,7 +158,7 @@ int exfat_set_bitmap(struct inode *inode, unsigned int clu)
|
||||
b = BITMAP_OFFSET_BIT_IN_SECTOR(sb, ent_idx);
|
||||
|
||||
set_bit_le(b, sbi->vol_amap[i]->b_data);
|
||||
exfat_update_bh(sb, sbi->vol_amap[i], IS_DIRSYNC(inode));
|
||||
exfat_update_bh(sbi->vol_amap[i], IS_DIRSYNC(inode));
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -180,7 +180,7 @@ void exfat_clear_bitmap(struct inode *inode, unsigned int clu)
|
||||
b = BITMAP_OFFSET_BIT_IN_SECTOR(sb, ent_idx);
|
||||
|
||||
clear_bit_le(b, sbi->vol_amap[i]->b_data);
|
||||
exfat_update_bh(sb, sbi->vol_amap[i], IS_DIRSYNC(inode));
|
||||
exfat_update_bh(sbi->vol_amap[i], IS_DIRSYNC(inode));
|
||||
|
||||
if (opts->discard) {
|
||||
int ret_discard;
|
||||
|
||||
@ -470,7 +470,7 @@ int exfat_init_dir_entry(struct inode *inode, struct exfat_chain *p_dir,
|
||||
&ep->dentry.file.access_date,
|
||||
NULL);
|
||||
|
||||
exfat_update_bh(sb, bh, IS_DIRSYNC(inode));
|
||||
exfat_update_bh(bh, IS_DIRSYNC(inode));
|
||||
brelse(bh);
|
||||
|
||||
ep = exfat_get_dentry(sb, p_dir, entry + 1, &bh, §or);
|
||||
@ -480,7 +480,7 @@ int exfat_init_dir_entry(struct inode *inode, struct exfat_chain *p_dir,
|
||||
exfat_init_stream_entry(ep,
|
||||
(type == TYPE_FILE) ? ALLOC_FAT_CHAIN : ALLOC_NO_FAT_CHAIN,
|
||||
start_clu, size);
|
||||
exfat_update_bh(sb, bh, IS_DIRSYNC(inode));
|
||||
exfat_update_bh(bh, IS_DIRSYNC(inode));
|
||||
brelse(bh);
|
||||
|
||||
return 0;
|
||||
@ -516,7 +516,7 @@ int exfat_update_dir_chksum(struct inode *inode, struct exfat_chain *p_dir,
|
||||
}
|
||||
|
||||
fep->dentry.file.checksum = cpu_to_le16(chksum);
|
||||
exfat_update_bh(sb, fbh, IS_DIRSYNC(inode));
|
||||
exfat_update_bh(fbh, IS_DIRSYNC(inode));
|
||||
release_fbh:
|
||||
brelse(fbh);
|
||||
return ret;
|
||||
@ -538,7 +538,7 @@ int exfat_init_ext_entry(struct inode *inode, struct exfat_chain *p_dir,
|
||||
return -EIO;
|
||||
|
||||
ep->dentry.file.num_ext = (unsigned char)(num_entries - 1);
|
||||
exfat_update_bh(sb, bh, sync);
|
||||
exfat_update_bh(bh, sync);
|
||||
brelse(bh);
|
||||
|
||||
ep = exfat_get_dentry(sb, p_dir, entry + 1, &bh, §or);
|
||||
@ -547,7 +547,7 @@ int exfat_init_ext_entry(struct inode *inode, struct exfat_chain *p_dir,
|
||||
|
||||
ep->dentry.stream.name_len = p_uniname->name_len;
|
||||
ep->dentry.stream.name_hash = cpu_to_le16(p_uniname->name_hash);
|
||||
exfat_update_bh(sb, bh, sync);
|
||||
exfat_update_bh(bh, sync);
|
||||
brelse(bh);
|
||||
|
||||
for (i = EXFAT_FIRST_CLUSTER; i < num_entries; i++) {
|
||||
@ -556,7 +556,7 @@ int exfat_init_ext_entry(struct inode *inode, struct exfat_chain *p_dir,
|
||||
return -EIO;
|
||||
|
||||
exfat_init_name_entry(ep, uniname);
|
||||
exfat_update_bh(sb, bh, sync);
|
||||
exfat_update_bh(bh, sync);
|
||||
brelse(bh);
|
||||
uniname += EXFAT_FILE_NAME_LEN;
|
||||
}
|
||||
@ -580,7 +580,7 @@ int exfat_remove_entries(struct inode *inode, struct exfat_chain *p_dir,
|
||||
return -EIO;
|
||||
|
||||
exfat_set_entry_type(ep, TYPE_DELETED);
|
||||
exfat_update_bh(sb, bh, IS_DIRSYNC(inode));
|
||||
exfat_update_bh(bh, IS_DIRSYNC(inode));
|
||||
brelse(bh);
|
||||
}
|
||||
|
||||
@ -604,16 +604,20 @@ void exfat_update_dir_chksum_with_entry_set(struct exfat_entry_set_cache *es)
|
||||
es->modified = true;
|
||||
}
|
||||
|
||||
void exfat_free_dentry_set(struct exfat_entry_set_cache *es, int sync)
|
||||
int exfat_free_dentry_set(struct exfat_entry_set_cache *es, int sync)
|
||||
{
|
||||
int i;
|
||||
int i, err = 0;
|
||||
|
||||
for (i = 0; i < es->num_bh; i++) {
|
||||
if (es->modified)
|
||||
exfat_update_bh(es->sb, es->bh[i], sync);
|
||||
brelse(es->bh[i]);
|
||||
}
|
||||
if (es->modified)
|
||||
err = exfat_update_bhs(es->bh, es->num_bh, sync);
|
||||
|
||||
for (i = 0; i < es->num_bh; i++)
|
||||
if (err)
|
||||
bforget(es->bh[i]);
|
||||
else
|
||||
brelse(es->bh[i]);
|
||||
kfree(es);
|
||||
return err;
|
||||
}
|
||||
|
||||
static int exfat_walk_fat_chain(struct super_block *sb,
|
||||
|
||||
@ -13,8 +13,6 @@
|
||||
#define EXFAT_SUPER_MAGIC 0x2011BAB0UL
|
||||
#define EXFAT_ROOT_INO 1
|
||||
|
||||
#define EXFAT_SB_DIRTY 0
|
||||
|
||||
#define EXFAT_CLUSTERS_UNTRACKED (~0u)
|
||||
|
||||
/*
|
||||
@ -226,7 +224,8 @@ struct exfat_sb_info {
|
||||
unsigned int num_FAT_sectors; /* num of FAT sectors */
|
||||
unsigned int root_dir; /* root dir cluster */
|
||||
unsigned int dentries_per_clu; /* num of dentries per cluster */
|
||||
unsigned int vol_flag; /* volume dirty flag */
|
||||
unsigned int vol_flags; /* volume flags */
|
||||
unsigned int vol_flags_persistent; /* volume flags to retain */
|
||||
struct buffer_head *boot_bh; /* buffer_head of BOOT sector */
|
||||
|
||||
unsigned int map_clu; /* allocation bitmap start cluster */
|
||||
@ -238,7 +237,6 @@ struct exfat_sb_info {
|
||||
unsigned int clu_srch_ptr; /* cluster search pointer */
|
||||
unsigned int used_clusters; /* number of used clusters */
|
||||
|
||||
unsigned long s_state;
|
||||
struct mutex s_lock; /* superblock lock */
|
||||
struct exfat_mount_options options;
|
||||
struct nls_table *nls_io; /* Charset used for input and display */
|
||||
@ -383,7 +381,8 @@ static inline int exfat_sector_to_cluster(struct exfat_sb_info *sbi,
|
||||
}
|
||||
|
||||
/* super.c */
|
||||
int exfat_set_vol_flags(struct super_block *sb, unsigned short new_flag);
|
||||
int exfat_set_volume_dirty(struct super_block *sb);
|
||||
int exfat_clear_volume_dirty(struct super_block *sb);
|
||||
|
||||
/* fatent.c */
|
||||
#define exfat_get_next_cluster(sb, pclu) exfat_ent_get(sb, *(pclu), pclu)
|
||||
@ -463,7 +462,7 @@ struct exfat_dentry *exfat_get_dentry_cached(struct exfat_entry_set_cache *es,
|
||||
int num);
|
||||
struct exfat_entry_set_cache *exfat_get_dentry_set(struct super_block *sb,
|
||||
struct exfat_chain *p_dir, int entry, unsigned int type);
|
||||
void exfat_free_dentry_set(struct exfat_entry_set_cache *es, int sync);
|
||||
int exfat_free_dentry_set(struct exfat_entry_set_cache *es, int sync);
|
||||
int exfat_count_dir_entries(struct super_block *sb, struct exfat_chain *p_dir);
|
||||
|
||||
/* inode.c */
|
||||
@ -515,7 +514,8 @@ void exfat_set_entry_time(struct exfat_sb_info *sbi, struct timespec64 *ts,
|
||||
u8 *tz, __le16 *time, __le16 *date, u8 *time_cs);
|
||||
u16 exfat_calc_chksum16(void *data, int len, u16 chksum, int type);
|
||||
u32 exfat_calc_chksum32(void *data, int len, u32 chksum, int type);
|
||||
void exfat_update_bh(struct super_block *sb, struct buffer_head *bh, int sync);
|
||||
void exfat_update_bh(struct buffer_head *bh, int sync);
|
||||
int exfat_update_bhs(struct buffer_head **bhs, int nr_bhs, int sync);
|
||||
void exfat_chain_set(struct exfat_chain *ec, unsigned int dir,
|
||||
unsigned int size, unsigned char flags);
|
||||
void exfat_chain_dup(struct exfat_chain *dup, struct exfat_chain *ec);
|
||||
|
||||
@ -14,9 +14,8 @@
|
||||
|
||||
#define EXFAT_MAX_FILE_LEN 255
|
||||
|
||||
#define VOL_CLEAN 0x0000
|
||||
#define VOL_DIRTY 0x0002
|
||||
#define ERR_MEDIUM 0x0004
|
||||
#define VOLUME_DIRTY 0x0002
|
||||
#define MEDIA_FAILURE 0x0004
|
||||
|
||||
#define EXFAT_EOF_CLUSTER 0xFFFFFFFFu
|
||||
#define EXFAT_BAD_CLUSTER 0xFFFFFFF7u
|
||||
|
||||
@ -75,7 +75,7 @@ int exfat_ent_set(struct super_block *sb, unsigned int loc,
|
||||
|
||||
fat_entry = (__le32 *)&(bh->b_data[off]);
|
||||
*fat_entry = cpu_to_le32(content);
|
||||
exfat_update_bh(sb, bh, sb->s_flags & SB_SYNCHRONOUS);
|
||||
exfat_update_bh(bh, sb->s_flags & SB_SYNCHRONOUS);
|
||||
exfat_mirror_bh(sb, sec, bh);
|
||||
brelse(bh);
|
||||
return 0;
|
||||
@ -174,7 +174,6 @@ int exfat_free_cluster(struct inode *inode, struct exfat_chain *p_chain)
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
set_bit(EXFAT_SB_DIRTY, &sbi->s_state);
|
||||
clu = p_chain->dir;
|
||||
|
||||
if (p_chain->flags == ALLOC_NO_FAT_CHAIN) {
|
||||
@ -230,21 +229,6 @@ int exfat_find_last_cluster(struct super_block *sb, struct exfat_chain *p_chain,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int exfat_sync_bhs(struct buffer_head **bhs, int nr_bhs)
|
||||
{
|
||||
int i, err = 0;
|
||||
|
||||
for (i = 0; i < nr_bhs; i++)
|
||||
write_dirty_buffer(bhs[i], 0);
|
||||
|
||||
for (i = 0; i < nr_bhs; i++) {
|
||||
wait_on_buffer(bhs[i]);
|
||||
if (!err && !buffer_uptodate(bhs[i]))
|
||||
err = -EIO;
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
||||
int exfat_zeroed_cluster(struct inode *dir, unsigned int clu)
|
||||
{
|
||||
struct super_block *sb = dir->i_sb;
|
||||
@ -266,41 +250,23 @@ int exfat_zeroed_cluster(struct inode *dir, unsigned int clu)
|
||||
}
|
||||
|
||||
/* Zeroing the unused blocks on this cluster */
|
||||
n = 0;
|
||||
while (blknr < last_blknr) {
|
||||
bhs[n] = sb_getblk(sb, blknr);
|
||||
if (!bhs[n]) {
|
||||
err = -ENOMEM;
|
||||
goto release_bhs;
|
||||
}
|
||||
memset(bhs[n]->b_data, 0, sb->s_blocksize);
|
||||
exfat_update_bh(sb, bhs[n], 0);
|
||||
|
||||
n++;
|
||||
blknr++;
|
||||
|
||||
if (n == nr_bhs) {
|
||||
if (IS_DIRSYNC(dir)) {
|
||||
err = exfat_sync_bhs(bhs, n);
|
||||
if (err)
|
||||
goto release_bhs;
|
||||
for (n = 0; n < nr_bhs && blknr < last_blknr; n++, blknr++) {
|
||||
bhs[n] = sb_getblk(sb, blknr);
|
||||
if (!bhs[n]) {
|
||||
err = -ENOMEM;
|
||||
goto release_bhs;
|
||||
}
|
||||
|
||||
for (i = 0; i < n; i++)
|
||||
brelse(bhs[i]);
|
||||
n = 0;
|
||||
memset(bhs[n]->b_data, 0, sb->s_blocksize);
|
||||
}
|
||||
}
|
||||
|
||||
if (IS_DIRSYNC(dir)) {
|
||||
err = exfat_sync_bhs(bhs, n);
|
||||
err = exfat_update_bhs(bhs, n, IS_DIRSYNC(dir));
|
||||
if (err)
|
||||
goto release_bhs;
|
||||
|
||||
for (i = 0; i < n; i++)
|
||||
brelse(bhs[i]);
|
||||
}
|
||||
|
||||
for (i = 0; i < n; i++)
|
||||
brelse(bhs[i]);
|
||||
|
||||
return 0;
|
||||
|
||||
release_bhs:
|
||||
@ -358,8 +324,6 @@ int exfat_alloc_cluster(struct inode *inode, unsigned int num_alloc,
|
||||
}
|
||||
}
|
||||
|
||||
set_bit(EXFAT_SB_DIRTY, &sbi->s_state);
|
||||
|
||||
p_chain->dir = EXFAT_EOF_CLUSTER;
|
||||
|
||||
while ((new_clu = exfat_find_free_bitmap(sb, hint_clu)) !=
|
||||
|
||||
@ -106,7 +106,7 @@ int __exfat_truncate(struct inode *inode, loff_t new_size)
|
||||
if (ei->type != TYPE_FILE && ei->type != TYPE_DIR)
|
||||
return -EPERM;
|
||||
|
||||
exfat_set_vol_flags(sb, VOL_DIRTY);
|
||||
exfat_set_volume_dirty(sb);
|
||||
|
||||
num_clusters_new = EXFAT_B_TO_CLU_ROUND_UP(i_size_read(inode), sbi);
|
||||
num_clusters_phys =
|
||||
@ -154,6 +154,7 @@ int __exfat_truncate(struct inode *inode, loff_t new_size)
|
||||
struct timespec64 ts;
|
||||
struct exfat_dentry *ep, *ep2;
|
||||
struct exfat_entry_set_cache *es;
|
||||
int err;
|
||||
|
||||
es = exfat_get_dentry_set(sb, &(ei->dir), ei->entry,
|
||||
ES_ALL_ENTRIES);
|
||||
@ -188,7 +189,9 @@ int __exfat_truncate(struct inode *inode, loff_t new_size)
|
||||
}
|
||||
|
||||
exfat_update_dir_chksum_with_entry_set(es);
|
||||
exfat_free_dentry_set(es, inode_needs_sync(inode));
|
||||
err = exfat_free_dentry_set(es, inode_needs_sync(inode));
|
||||
if (err)
|
||||
return err;
|
||||
}
|
||||
|
||||
/* cut off from the FAT chain */
|
||||
@ -217,7 +220,7 @@ int __exfat_truncate(struct inode *inode, loff_t new_size)
|
||||
if (exfat_free_cluster(inode, &clu))
|
||||
return -EIO;
|
||||
|
||||
exfat_set_vol_flags(sb, VOL_CLEAN);
|
||||
exfat_clear_volume_dirty(sb);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -39,7 +39,7 @@ static int __exfat_write_inode(struct inode *inode, int sync)
|
||||
if (is_dir && ei->dir.dir == sbi->root_dir && ei->entry == -1)
|
||||
return 0;
|
||||
|
||||
exfat_set_vol_flags(sb, VOL_DIRTY);
|
||||
exfat_set_volume_dirty(sb);
|
||||
|
||||
/* get the directory entry of given file or directory */
|
||||
es = exfat_get_dentry_set(sb, &(ei->dir), ei->entry, ES_ALL_ENTRIES);
|
||||
@ -77,8 +77,7 @@ static int __exfat_write_inode(struct inode *inode, int sync)
|
||||
ep2->dentry.stream.size = ep2->dentry.stream.valid_size;
|
||||
|
||||
exfat_update_dir_chksum_with_entry_set(es);
|
||||
exfat_free_dentry_set(es, sync);
|
||||
return 0;
|
||||
return exfat_free_dentry_set(es, sync);
|
||||
}
|
||||
|
||||
int exfat_write_inode(struct inode *inode, struct writeback_control *wbc)
|
||||
@ -168,7 +167,7 @@ static int exfat_map_cluster(struct inode *inode, unsigned int clu_offset,
|
||||
}
|
||||
|
||||
if (*clu == EXFAT_EOF_CLUSTER) {
|
||||
exfat_set_vol_flags(sb, VOL_DIRTY);
|
||||
exfat_set_volume_dirty(sb);
|
||||
|
||||
new_clu.dir = (last_clu == EXFAT_EOF_CLUSTER) ?
|
||||
EXFAT_EOF_CLUSTER : last_clu + 1;
|
||||
@ -222,6 +221,7 @@ static int exfat_map_cluster(struct inode *inode, unsigned int clu_offset,
|
||||
if (ei->dir.dir != DIR_DELETED && modified) {
|
||||
struct exfat_dentry *ep;
|
||||
struct exfat_entry_set_cache *es;
|
||||
int err;
|
||||
|
||||
es = exfat_get_dentry_set(sb, &(ei->dir), ei->entry,
|
||||
ES_ALL_ENTRIES);
|
||||
@ -240,8 +240,9 @@ static int exfat_map_cluster(struct inode *inode, unsigned int clu_offset,
|
||||
ep->dentry.stream.valid_size;
|
||||
|
||||
exfat_update_dir_chksum_with_entry_set(es);
|
||||
exfat_free_dentry_set(es, inode_needs_sync(inode));
|
||||
|
||||
err = exfat_free_dentry_set(es, inode_needs_sync(inode));
|
||||
if (err)
|
||||
return err;
|
||||
} /* end of if != DIR_DELETED */
|
||||
|
||||
inode->i_blocks +=
|
||||
|
||||
@ -163,9 +163,8 @@ u32 exfat_calc_chksum32(void *data, int len, u32 chksum, int type)
|
||||
return chksum;
|
||||
}
|
||||
|
||||
void exfat_update_bh(struct super_block *sb, struct buffer_head *bh, int sync)
|
||||
void exfat_update_bh(struct buffer_head *bh, int sync)
|
||||
{
|
||||
set_bit(EXFAT_SB_DIRTY, &EXFAT_SB(sb)->s_state);
|
||||
set_buffer_uptodate(bh);
|
||||
mark_buffer_dirty(bh);
|
||||
|
||||
@ -173,6 +172,25 @@ void exfat_update_bh(struct super_block *sb, struct buffer_head *bh, int sync)
|
||||
sync_dirty_buffer(bh);
|
||||
}
|
||||
|
||||
int exfat_update_bhs(struct buffer_head **bhs, int nr_bhs, int sync)
|
||||
{
|
||||
int i, err = 0;
|
||||
|
||||
for (i = 0; i < nr_bhs; i++) {
|
||||
set_buffer_uptodate(bhs[i]);
|
||||
mark_buffer_dirty(bhs[i]);
|
||||
if (sync)
|
||||
write_dirty_buffer(bhs[i], 0);
|
||||
}
|
||||
|
||||
for (i = 0; i < nr_bhs && sync; i++) {
|
||||
wait_on_buffer(bhs[i]);
|
||||
if (!err && !buffer_uptodate(bhs[i]))
|
||||
err = -EIO;
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
||||
void exfat_chain_set(struct exfat_chain *ec, unsigned int dir,
|
||||
unsigned int size, unsigned char flags)
|
||||
{
|
||||
|
||||
@ -387,7 +387,7 @@ static int exfat_find_empty_entry(struct inode *inode,
|
||||
ep->dentry.stream.valid_size = cpu_to_le64(size);
|
||||
ep->dentry.stream.size = ep->dentry.stream.valid_size;
|
||||
ep->dentry.stream.flags = p_dir->flags;
|
||||
exfat_update_bh(sb, bh, IS_DIRSYNC(inode));
|
||||
exfat_update_bh(bh, IS_DIRSYNC(inode));
|
||||
brelse(bh);
|
||||
if (exfat_update_dir_chksum(inode, &(ei->dir),
|
||||
ei->entry))
|
||||
@ -562,10 +562,10 @@ static int exfat_create(struct inode *dir, struct dentry *dentry, umode_t mode,
|
||||
int err;
|
||||
|
||||
mutex_lock(&EXFAT_SB(sb)->s_lock);
|
||||
exfat_set_vol_flags(sb, VOL_DIRTY);
|
||||
exfat_set_volume_dirty(sb);
|
||||
err = exfat_add_entry(dir, dentry->d_name.name, &cdir, TYPE_FILE,
|
||||
&info);
|
||||
exfat_set_vol_flags(sb, VOL_CLEAN);
|
||||
exfat_clear_volume_dirty(sb);
|
||||
if (err)
|
||||
goto unlock;
|
||||
|
||||
@ -834,7 +834,7 @@ static int exfat_unlink(struct inode *dir, struct dentry *dentry)
|
||||
num_entries++;
|
||||
brelse(bh);
|
||||
|
||||
exfat_set_vol_flags(sb, VOL_DIRTY);
|
||||
exfat_set_volume_dirty(sb);
|
||||
/* update the directory entry */
|
||||
if (exfat_remove_entries(dir, &cdir, entry, 0, num_entries)) {
|
||||
err = -EIO;
|
||||
@ -843,7 +843,7 @@ static int exfat_unlink(struct inode *dir, struct dentry *dentry)
|
||||
|
||||
/* This doesn't modify ei */
|
||||
ei->dir.dir = DIR_DELETED;
|
||||
exfat_set_vol_flags(sb, VOL_CLEAN);
|
||||
exfat_clear_volume_dirty(sb);
|
||||
|
||||
inode_inc_iversion(dir);
|
||||
dir->i_mtime = dir->i_atime = current_time(dir);
|
||||
@ -873,10 +873,10 @@ static int exfat_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
|
||||
int err;
|
||||
|
||||
mutex_lock(&EXFAT_SB(sb)->s_lock);
|
||||
exfat_set_vol_flags(sb, VOL_DIRTY);
|
||||
exfat_set_volume_dirty(sb);
|
||||
err = exfat_add_entry(dir, dentry->d_name.name, &cdir, TYPE_DIR,
|
||||
&info);
|
||||
exfat_set_vol_flags(sb, VOL_CLEAN);
|
||||
exfat_clear_volume_dirty(sb);
|
||||
if (err)
|
||||
goto unlock;
|
||||
|
||||
@ -1001,14 +1001,14 @@ static int exfat_rmdir(struct inode *dir, struct dentry *dentry)
|
||||
num_entries++;
|
||||
brelse(bh);
|
||||
|
||||
exfat_set_vol_flags(sb, VOL_DIRTY);
|
||||
exfat_set_volume_dirty(sb);
|
||||
err = exfat_remove_entries(dir, &cdir, entry, 0, num_entries);
|
||||
if (err) {
|
||||
exfat_err(sb, "failed to exfat_remove_entries : err(%d)", err);
|
||||
goto unlock;
|
||||
}
|
||||
ei->dir.dir = DIR_DELETED;
|
||||
exfat_set_vol_flags(sb, VOL_CLEAN);
|
||||
exfat_clear_volume_dirty(sb);
|
||||
|
||||
inode_inc_iversion(dir);
|
||||
dir->i_mtime = dir->i_atime = current_time(dir);
|
||||
@ -1071,7 +1071,7 @@ static int exfat_rename_file(struct inode *inode, struct exfat_chain *p_dir,
|
||||
epnew->dentry.file.attr |= cpu_to_le16(ATTR_ARCHIVE);
|
||||
ei->attr |= ATTR_ARCHIVE;
|
||||
}
|
||||
exfat_update_bh(sb, new_bh, sync);
|
||||
exfat_update_bh(new_bh, sync);
|
||||
brelse(old_bh);
|
||||
brelse(new_bh);
|
||||
|
||||
@ -1087,7 +1087,7 @@ static int exfat_rename_file(struct inode *inode, struct exfat_chain *p_dir,
|
||||
}
|
||||
|
||||
memcpy(epnew, epold, DENTRY_SIZE);
|
||||
exfat_update_bh(sb, new_bh, sync);
|
||||
exfat_update_bh(new_bh, sync);
|
||||
brelse(old_bh);
|
||||
brelse(new_bh);
|
||||
|
||||
@ -1104,7 +1104,7 @@ static int exfat_rename_file(struct inode *inode, struct exfat_chain *p_dir,
|
||||
epold->dentry.file.attr |= cpu_to_le16(ATTR_ARCHIVE);
|
||||
ei->attr |= ATTR_ARCHIVE;
|
||||
}
|
||||
exfat_update_bh(sb, old_bh, sync);
|
||||
exfat_update_bh(old_bh, sync);
|
||||
brelse(old_bh);
|
||||
ret = exfat_init_ext_entry(inode, p_dir, oldentry,
|
||||
num_new_entries, p_uniname);
|
||||
@ -1159,7 +1159,7 @@ static int exfat_move_file(struct inode *inode, struct exfat_chain *p_olddir,
|
||||
epnew->dentry.file.attr |= cpu_to_le16(ATTR_ARCHIVE);
|
||||
ei->attr |= ATTR_ARCHIVE;
|
||||
}
|
||||
exfat_update_bh(sb, new_bh, IS_DIRSYNC(inode));
|
||||
exfat_update_bh(new_bh, IS_DIRSYNC(inode));
|
||||
brelse(mov_bh);
|
||||
brelse(new_bh);
|
||||
|
||||
@ -1175,7 +1175,7 @@ static int exfat_move_file(struct inode *inode, struct exfat_chain *p_olddir,
|
||||
}
|
||||
|
||||
memcpy(epnew, epmov, DENTRY_SIZE);
|
||||
exfat_update_bh(sb, new_bh, IS_DIRSYNC(inode));
|
||||
exfat_update_bh(new_bh, IS_DIRSYNC(inode));
|
||||
brelse(mov_bh);
|
||||
brelse(new_bh);
|
||||
|
||||
@ -1300,7 +1300,7 @@ static int __exfat_rename(struct inode *old_parent_inode,
|
||||
if (ret)
|
||||
goto out;
|
||||
|
||||
exfat_set_vol_flags(sb, VOL_DIRTY);
|
||||
exfat_set_volume_dirty(sb);
|
||||
|
||||
if (olddir.dir == newdir.dir)
|
||||
ret = exfat_rename_file(new_parent_inode, &olddir, dentry,
|
||||
@ -1355,7 +1355,7 @@ del_out:
|
||||
*/
|
||||
new_ei->dir.dir = DIR_DELETED;
|
||||
}
|
||||
exfat_set_vol_flags(sb, VOL_CLEAN);
|
||||
exfat_clear_volume_dirty(sb);
|
||||
out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -45,9 +45,6 @@ static void exfat_put_super(struct super_block *sb)
|
||||
struct exfat_sb_info *sbi = EXFAT_SB(sb);
|
||||
|
||||
mutex_lock(&sbi->s_lock);
|
||||
if (test_and_clear_bit(EXFAT_SB_DIRTY, &sbi->s_state))
|
||||
sync_blockdev(sb->s_bdev);
|
||||
exfat_set_vol_flags(sb, VOL_CLEAN);
|
||||
exfat_free_bitmap(sbi);
|
||||
brelse(sbi->boot_bh);
|
||||
mutex_unlock(&sbi->s_lock);
|
||||
@ -60,13 +57,14 @@ static int exfat_sync_fs(struct super_block *sb, int wait)
|
||||
struct exfat_sb_info *sbi = EXFAT_SB(sb);
|
||||
int err = 0;
|
||||
|
||||
if (!wait)
|
||||
return 0;
|
||||
|
||||
/* If there are some dirty buffers in the bdev inode */
|
||||
mutex_lock(&sbi->s_lock);
|
||||
if (test_and_clear_bit(EXFAT_SB_DIRTY, &sbi->s_state)) {
|
||||
sync_blockdev(sb->s_bdev);
|
||||
if (exfat_set_vol_flags(sb, VOL_CLEAN))
|
||||
err = -EIO;
|
||||
}
|
||||
sync_blockdev(sb->s_bdev);
|
||||
if (exfat_clear_volume_dirty(sb))
|
||||
err = -EIO;
|
||||
mutex_unlock(&sbi->s_lock);
|
||||
return err;
|
||||
}
|
||||
@ -98,17 +96,20 @@ static int exfat_statfs(struct dentry *dentry, struct kstatfs *buf)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int exfat_set_vol_flags(struct super_block *sb, unsigned short new_flag)
|
||||
static int exfat_set_vol_flags(struct super_block *sb, unsigned short new_flags)
|
||||
{
|
||||
struct exfat_sb_info *sbi = EXFAT_SB(sb);
|
||||
struct boot_sector *p_boot = (struct boot_sector *)sbi->boot_bh->b_data;
|
||||
bool sync;
|
||||
|
||||
/* retain persistent-flags */
|
||||
new_flags |= sbi->vol_flags_persistent;
|
||||
|
||||
/* flags are not changed */
|
||||
if (sbi->vol_flag == new_flag)
|
||||
if (sbi->vol_flags == new_flags)
|
||||
return 0;
|
||||
|
||||
sbi->vol_flag = new_flag;
|
||||
sbi->vol_flags = new_flags;
|
||||
|
||||
/* skip updating volume dirty flag,
|
||||
* if this volume has been mounted with read-only
|
||||
@ -116,9 +117,9 @@ int exfat_set_vol_flags(struct super_block *sb, unsigned short new_flag)
|
||||
if (sb_rdonly(sb))
|
||||
return 0;
|
||||
|
||||
p_boot->vol_flags = cpu_to_le16(new_flag);
|
||||
p_boot->vol_flags = cpu_to_le16(new_flags);
|
||||
|
||||
if (new_flag == VOL_DIRTY && !buffer_dirty(sbi->boot_bh))
|
||||
if ((new_flags & VOLUME_DIRTY) && !buffer_dirty(sbi->boot_bh))
|
||||
sync = true;
|
||||
else
|
||||
sync = false;
|
||||
@ -131,6 +132,20 @@ int exfat_set_vol_flags(struct super_block *sb, unsigned short new_flag)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int exfat_set_volume_dirty(struct super_block *sb)
|
||||
{
|
||||
struct exfat_sb_info *sbi = EXFAT_SB(sb);
|
||||
|
||||
return exfat_set_vol_flags(sb, sbi->vol_flags | VOLUME_DIRTY);
|
||||
}
|
||||
|
||||
int exfat_clear_volume_dirty(struct super_block *sb)
|
||||
{
|
||||
struct exfat_sb_info *sbi = EXFAT_SB(sb);
|
||||
|
||||
return exfat_set_vol_flags(sb, sbi->vol_flags & ~VOLUME_DIRTY);
|
||||
}
|
||||
|
||||
static int exfat_show_options(struct seq_file *m, struct dentry *root)
|
||||
{
|
||||
struct super_block *sb = root->d_sb;
|
||||
@ -459,7 +474,8 @@ static int exfat_read_boot_sector(struct super_block *sb)
|
||||
sbi->dentries_per_clu = 1 <<
|
||||
(sbi->cluster_size_bits - DENTRY_SIZE_BITS);
|
||||
|
||||
sbi->vol_flag = le16_to_cpu(p_boot->vol_flags);
|
||||
sbi->vol_flags = le16_to_cpu(p_boot->vol_flags);
|
||||
sbi->vol_flags_persistent = sbi->vol_flags & (VOLUME_DIRTY | MEDIA_FAILURE);
|
||||
sbi->clu_srch_ptr = EXFAT_FIRST_CLUSTER;
|
||||
sbi->used_clusters = EXFAT_CLUSTERS_UNTRACKED;
|
||||
|
||||
@ -474,9 +490,9 @@ static int exfat_read_boot_sector(struct super_block *sb)
|
||||
exfat_err(sb, "bogus data start sector");
|
||||
return -EINVAL;
|
||||
}
|
||||
if (sbi->vol_flag & VOL_DIRTY)
|
||||
if (sbi->vol_flags & VOLUME_DIRTY)
|
||||
exfat_warn(sb, "Volume was not properly unmounted. Some data may be corrupt. Please run fsck.");
|
||||
if (sbi->vol_flag & ERR_MEDIUM)
|
||||
if (sbi->vol_flags & MEDIA_FAILURE)
|
||||
exfat_warn(sb, "Medium has reported failures. Some data may be lost.");
|
||||
|
||||
/* exFAT file size is limited by a disk volume size */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user