mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-10 22:40:54 -04:00
Namjae Jeon
GitHub
commit
e758ac7113
10 changed files with 196 additions and 104 deletions
|
|
@ -183,4 +183,4 @@ script:
|
|||
- sudo ./check generic/448
|
||||
- sudo ./check generic/450
|
||||
- sudo ./check generic/451
|
||||
# - sudo ./check generic/452
|
||||
- sudo ./check generic/452
|
||||
|
|
|
|||
4
balloc.c
4
balloc.c
|
|
@ -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;
|
||||
|
|
|
|||
48
dir.c
48
dir.c
|
|
@ -310,7 +310,7 @@ const struct file_operations exfat_dir_operations = {
|
|||
.llseek = generic_file_llseek,
|
||||
.read = generic_read_dir,
|
||||
.iterate = exfat_iterate,
|
||||
.fsync = generic_file_fsync,
|
||||
.fsync = exfat_file_fsync,
|
||||
};
|
||||
|
||||
int exfat_alloc_new_dir(struct inode *inode, struct exfat_chain *clu)
|
||||
|
|
@ -441,15 +441,21 @@ int exfat_init_dir_entry(struct inode *inode, struct exfat_chain *p_dir,
|
|||
{
|
||||
struct super_block *sb = inode->i_sb;
|
||||
struct exfat_sb_info *sbi = EXFAT_SB(sb);
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
|
||||
struct timespec64 ts = current_time(inode);
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0)
|
||||
struct timespec64 ts;
|
||||
#else
|
||||
struct timespec64 ts = CURRENT_TIME_SEC;
|
||||
struct timespec ts;
|
||||
#endif
|
||||
sector_t sector;
|
||||
struct exfat_dentry *ep;
|
||||
struct buffer_head *bh;
|
||||
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
|
||||
ts = current_time(inode);
|
||||
#else
|
||||
ts = CURRENT_TIME_SEC;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* We cannot use exfat_get_dentry_set here because file ep is not
|
||||
* initialized yet.
|
||||
|
|
@ -475,7 +481,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);
|
||||
|
|
@ -485,7 +491,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;
|
||||
|
|
@ -521,7 +527,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;
|
||||
|
|
@ -543,7 +549,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);
|
||||
|
|
@ -552,7 +558,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++) {
|
||||
|
|
@ -561,7 +567,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;
|
||||
}
|
||||
|
|
@ -585,7 +591,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);
|
||||
}
|
||||
|
||||
|
|
@ -609,16 +615,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,
|
||||
|
|
@ -1117,7 +1127,7 @@ found:
|
|||
ret = exfat_get_next_cluster(sb, &clu.dir);
|
||||
}
|
||||
|
||||
if (ret || clu.dir != EXFAT_EOF_CLUSTER) {
|
||||
if (ret || clu.dir == EXFAT_EOF_CLUSTER) {
|
||||
/* just initialized hint_stat */
|
||||
hint_stat->clu = p_dir->dir;
|
||||
hint_stat->eidx = 0;
|
||||
|
|
|
|||
31
exfat_fs.h
31
exfat_fs.h
|
|
@ -11,13 +11,11 @@
|
|||
#include <linux/ratelimit.h>
|
||||
#include <linux/nls.h>
|
||||
|
||||
#define EXFAT_VERSION "5.8.1"
|
||||
#define EXFAT_VERSION "5.8.4"
|
||||
|
||||
#define EXFAT_SUPER_MAGIC 0x2011BAB0UL
|
||||
#define EXFAT_ROOT_INO 1
|
||||
|
||||
#define EXFAT_SB_DIRTY 0
|
||||
|
||||
#define EXFAT_CLUSTERS_UNTRACKED (~0u)
|
||||
|
||||
/*
|
||||
|
|
@ -188,9 +186,15 @@ struct exfat_dir_entry {
|
|||
unsigned short attr;
|
||||
loff_t size;
|
||||
unsigned int num_subdirs;
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0)
|
||||
struct timespec64 atime;
|
||||
struct timespec64 mtime;
|
||||
struct timespec64 crtime;
|
||||
#else
|
||||
struct timespec atime;
|
||||
struct timespec mtime;
|
||||
struct timespec crtime;
|
||||
#endif
|
||||
struct exfat_dentry_namebuf namebuf;
|
||||
};
|
||||
|
||||
|
|
@ -241,7 +245,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 */
|
||||
|
|
@ -299,7 +302,11 @@ struct exfat_inode_info {
|
|||
struct rw_semaphore truncate_lock;
|
||||
struct inode vfs_inode;
|
||||
/* File creation time */
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0)
|
||||
struct timespec64 i_crtime;
|
||||
#else
|
||||
struct timespec i_crtime;
|
||||
#endif
|
||||
};
|
||||
|
||||
static inline struct exfat_sb_info *EXFAT_SB(struct super_block *sb)
|
||||
|
|
@ -374,7 +381,7 @@ static inline bool exfat_is_last_sector_in_cluster(struct exfat_sb_info *sbi,
|
|||
static inline sector_t exfat_cluster_to_sector(struct exfat_sb_info *sbi,
|
||||
unsigned int clus)
|
||||
{
|
||||
return ((clus - EXFAT_RESERVED_CLUSTERS) << sbi->sect_per_clus_bits) +
|
||||
return ((sector_t)(clus - EXFAT_RESERVED_CLUSTERS) << sbi->sect_per_clus_bits) +
|
||||
sbi->data_start_sector;
|
||||
}
|
||||
|
||||
|
|
@ -428,6 +435,7 @@ int exfat_getattr(const struct path *path, struct kstat *stat,
|
|||
int exfat_getattr(struct vfsmount *mnt, struct dentry *dentry,
|
||||
struct kstat *stat);
|
||||
#endif
|
||||
int exfat_file_fsync(struct file *file, loff_t start, loff_t end, int datasync);
|
||||
|
||||
|
||||
/* namei.c */
|
||||
|
|
@ -471,7 +479,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 */
|
||||
|
|
@ -516,14 +524,23 @@ void exfat_msg(struct super_block *sb, const char *lv, const char *fmt, ...)
|
|||
#define exfat_info(sb, fmt, ...) \
|
||||
exfat_msg(sb, KERN_INFO, fmt, ##__VA_ARGS__)
|
||||
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0)
|
||||
void exfat_get_entry_time(struct exfat_sb_info *sbi, struct timespec64 *ts,
|
||||
u8 tz, __le16 time, __le16 date, u8 time_cs);
|
||||
void exfat_truncate_atime(struct timespec64 *ts);
|
||||
void exfat_set_entry_time(struct exfat_sb_info *sbi, struct timespec64 *ts,
|
||||
u8 *tz, __le16 *time, __le16 *date, u8 *time_cs);
|
||||
#else
|
||||
void exfat_get_entry_time(struct exfat_sb_info *sbi, struct timespec *ts,
|
||||
u8 tz, __le16 time, __le16 date, u8 time_cs);
|
||||
void exfat_truncate_atime(struct timespec *ts);
|
||||
void exfat_set_entry_time(struct exfat_sb_info *sbi, struct timespec *ts,
|
||||
u8 *tz, __le16 *time, __le16 *date, u8 *time_cs);
|
||||
#endif
|
||||
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);
|
||||
|
|
|
|||
60
fatent.c
60
fatent.c
|
|
@ -80,9 +80,9 @@ int exfat_ent_set(struct super_block *sb, unsigned int loc,
|
|||
fat_entry = (__le32 *)&(bh->b_data[off]);
|
||||
*fat_entry = cpu_to_le32(content);
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
|
||||
exfat_update_bh(sb, bh, sb->s_flags & SB_SYNCHRONOUS);
|
||||
exfat_update_bh(bh, sb->s_flags & SB_SYNCHRONOUS);
|
||||
#else
|
||||
exfat_update_bh(sb, bh, sb->s_flags & MS_SYNCHRONOUS);
|
||||
exfat_update_bh(bh, sb->s_flags & MS_SYNCHRONOUS);
|
||||
#endif
|
||||
exfat_mirror_bh(sb, sec, bh);
|
||||
brelse(bh);
|
||||
|
|
@ -182,7 +182,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) {
|
||||
|
|
@ -238,21 +237,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;
|
||||
|
|
@ -274,41 +258,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:
|
||||
|
|
@ -366,8 +332,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)) !=
|
||||
|
|
|
|||
32
file.c
32
file.c
|
|
@ -11,6 +11,7 @@
|
|||
#else
|
||||
#include <linux/compat.h>
|
||||
#endif
|
||||
#include <linux/blkdev.h>
|
||||
|
||||
#include "exfat_raw.h"
|
||||
#include "exfat_fs.h"
|
||||
|
|
@ -159,9 +160,14 @@ int __exfat_truncate(struct inode *inode, loff_t new_size)
|
|||
|
||||
/* update the directory entry */
|
||||
if (!evict) {
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0)
|
||||
struct timespec64 ts;
|
||||
#else
|
||||
struct timespec ts;
|
||||
#endif
|
||||
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);
|
||||
|
|
@ -200,7 +206,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 */
|
||||
|
|
@ -381,12 +389,32 @@ out:
|
|||
return error;
|
||||
}
|
||||
|
||||
int exfat_file_fsync(struct file *filp, loff_t start, loff_t end, int datasync)
|
||||
{
|
||||
struct inode *inode = filp->f_mapping->host;
|
||||
int err;
|
||||
|
||||
err = __generic_file_fsync(filp, start, end, datasync);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
err = sync_blockdev(inode->i_sb->s_bdev);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
|
||||
return blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL);
|
||||
#else
|
||||
return blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL);
|
||||
#endif
|
||||
}
|
||||
|
||||
const struct file_operations exfat_file_operations = {
|
||||
.llseek = generic_file_llseek,
|
||||
.read_iter = generic_file_read_iter,
|
||||
.write_iter = generic_file_write_iter,
|
||||
.mmap = generic_file_mmap,
|
||||
.fsync = generic_file_fsync,
|
||||
.fsync = exfat_file_fsync,
|
||||
.splice_read = generic_file_splice_read,
|
||||
.splice_write = iter_file_splice_write,
|
||||
};
|
||||
|
|
|
|||
20
inode.c
20
inode.c
|
|
@ -79,8 +79,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)
|
||||
|
|
@ -224,6 +223,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);
|
||||
|
|
@ -242,8 +242,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 +=
|
||||
|
|
@ -365,11 +366,18 @@ static int exfat_readpage(struct file *file, struct page *page)
|
|||
return mpage_readpage(page, exfat_get_block);
|
||||
}
|
||||
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
|
||||
static void exfat_readahead(struct readahead_control *rac)
|
||||
{
|
||||
mpage_readahead(rac, exfat_get_block);
|
||||
}
|
||||
#else
|
||||
static int exfat_readpages(struct file *file, struct address_space *mapping,
|
||||
struct list_head *pages, unsigned int nr_pages)
|
||||
{
|
||||
return mpage_readpages(mapping, pages, nr_pages, exfat_get_block);
|
||||
}
|
||||
#endif
|
||||
|
||||
static int exfat_writepage(struct page *page, struct writeback_control *wbc)
|
||||
{
|
||||
|
|
@ -509,7 +517,11 @@ int exfat_block_truncate_page(struct inode *inode, loff_t from)
|
|||
|
||||
static const struct address_space_operations exfat_aops = {
|
||||
.readpage = exfat_readpage,
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
|
||||
.readahead = exfat_readahead,
|
||||
#else
|
||||
.readpages = exfat_readpages,
|
||||
#endif
|
||||
.writepage = exfat_writepage,
|
||||
.writepages = exfat_writepages,
|
||||
.write_begin = exfat_write_begin,
|
||||
|
|
|
|||
40
misc.c
40
misc.c
|
|
@ -71,7 +71,11 @@ void exfat_msg(struct super_block *sb, const char *level, const char *fmt, ...)
|
|||
#define SECS_PER_MIN (60)
|
||||
#define TIMEZONE_SEC(x) ((x) * 15 * SECS_PER_MIN)
|
||||
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0)
|
||||
static void exfat_adjust_tz(struct timespec64 *ts, u8 tz_off)
|
||||
#else
|
||||
static void exfat_adjust_tz(struct timespec *ts, u8 tz_off)
|
||||
#endif
|
||||
{
|
||||
if (tz_off <= 0x3F)
|
||||
ts->tv_sec -= TIMEZONE_SEC(tz_off);
|
||||
|
|
@ -80,8 +84,13 @@ static void exfat_adjust_tz(struct timespec64 *ts, u8 tz_off)
|
|||
}
|
||||
|
||||
/* Convert a EXFAT time/date pair to a UNIX date (seconds since 1 1 70). */
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0)
|
||||
void exfat_get_entry_time(struct exfat_sb_info *sbi, struct timespec64 *ts,
|
||||
u8 tz, __le16 time, __le16 date, u8 time_cs)
|
||||
#else
|
||||
void exfat_get_entry_time(struct exfat_sb_info *sbi, struct timespec *ts,
|
||||
u8 tz, __le16 time, __le16 date, u8 time_cs)
|
||||
#endif
|
||||
{
|
||||
u16 t = le16_to_cpu(time);
|
||||
u16 d = le16_to_cpu(date);
|
||||
|
|
@ -106,8 +115,13 @@ void exfat_get_entry_time(struct exfat_sb_info *sbi, struct timespec64 *ts,
|
|||
}
|
||||
|
||||
/* Convert linear UNIX date to a EXFAT time/date pair. */
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0)
|
||||
void exfat_set_entry_time(struct exfat_sb_info *sbi, struct timespec64 *ts,
|
||||
u8 *tz, __le16 *time, __le16 *date, u8 *time_cs)
|
||||
#else
|
||||
void exfat_set_entry_time(struct exfat_sb_info *sbi, struct timespec *ts,
|
||||
u8 *tz, __le16 *time, __le16 *date, u8 *time_cs)
|
||||
#endif
|
||||
{
|
||||
struct tm tm;
|
||||
u16 t, d;
|
||||
|
|
@ -136,7 +150,11 @@ void exfat_set_entry_time(struct exfat_sb_info *sbi, struct timespec64 *ts,
|
|||
}
|
||||
|
||||
/* atime has only a 2-second resolution */
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0)
|
||||
void exfat_truncate_atime(struct timespec64 *ts)
|
||||
#else
|
||||
void exfat_truncate_atime(struct timespec *ts)
|
||||
#endif
|
||||
{
|
||||
ts->tv_sec = round_down(ts->tv_sec, 2);
|
||||
ts->tv_nsec = 0;
|
||||
|
|
@ -169,9 +187,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);
|
||||
|
||||
|
|
@ -179,6 +196,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)
|
||||
{
|
||||
|
|
|
|||
14
namei.c
14
namei.c
|
|
@ -414,7 +414,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))
|
||||
|
|
@ -1066,7 +1066,6 @@ static int exfat_rmdir(struct inode *dir, struct dentry *dentry)
|
|||
goto unlock;
|
||||
}
|
||||
|
||||
exfat_set_vol_flags(sb, VOL_DIRTY);
|
||||
exfat_chain_set(&clu_to_free, ei->start_clu,
|
||||
EXFAT_B_TO_CLU_ROUND_UP(i_size_read(inode), sbi), ei->flags);
|
||||
|
||||
|
|
@ -1093,6 +1092,7 @@ static int exfat_rmdir(struct inode *dir, struct dentry *dentry)
|
|||
num_entries++;
|
||||
brelse(bh);
|
||||
|
||||
exfat_set_vol_flags(sb, VOL_DIRTY);
|
||||
err = exfat_remove_entries(dir, &cdir, entry, 0, num_entries);
|
||||
if (err) {
|
||||
exfat_err(sb, "failed to exfat_remove_entries : err(%d)", err);
|
||||
|
|
@ -1178,7 +1178,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);
|
||||
|
||||
|
|
@ -1194,7 +1194,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);
|
||||
|
||||
|
|
@ -1211,7 +1211,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);
|
||||
|
|
@ -1266,7 +1266,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);
|
||||
|
||||
|
|
@ -1282,7 +1282,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);
|
||||
|
||||
|
|
|
|||
49
super.c
49
super.c
|
|
@ -58,9 +58,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);
|
||||
|
|
@ -73,13 +70,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_set_vol_flags(sb, VOL_CLEAN))
|
||||
err = -EIO;
|
||||
mutex_unlock(&sbi->s_lock);
|
||||
return err;
|
||||
}
|
||||
|
|
@ -209,6 +207,18 @@ static void exfat_destroy_inode(struct inode *inode)
|
|||
{
|
||||
call_rcu(&inode->i_rcu, exfat_i_callback);
|
||||
}
|
||||
|
||||
static int exfat_remount(struct super_block *sb, int *flags, char *data)
|
||||
{
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
|
||||
*flags |= SB_NODIRATIME;
|
||||
#else
|
||||
*flags |= MS_NODIRATIME;
|
||||
#endif
|
||||
|
||||
sync_filesystem(sb);
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static const struct super_operations exfat_sops = {
|
||||
|
|
@ -217,6 +227,7 @@ static const struct super_operations exfat_sops = {
|
|||
.free_inode = exfat_free_inode,
|
||||
#else
|
||||
.destroy_inode = exfat_destroy_inode,
|
||||
.remount_fs = exfat_remount,
|
||||
#endif
|
||||
.write_inode = exfat_write_inode,
|
||||
.evict_inode = exfat_evict_inode,
|
||||
|
|
@ -337,9 +348,8 @@ static int exfat_parse_param(struct fs_context *fc, struct fs_parameter *param)
|
|||
break;
|
||||
case Opt_charset:
|
||||
exfat_free_iocharset(sbi);
|
||||
opts->iocharset = kstrdup(param->string, GFP_KERNEL);
|
||||
if (!opts->iocharset)
|
||||
return -ENOMEM;
|
||||
opts->iocharset = param->string;
|
||||
param->string = NULL;
|
||||
break;
|
||||
case Opt_errors:
|
||||
opts->errors = result.uint_32;
|
||||
|
|
@ -962,13 +972,28 @@ static int exfat_get_tree(struct fs_context *fc)
|
|||
|
||||
static void exfat_free(struct fs_context *fc)
|
||||
{
|
||||
kfree(fc->s_fs_info);
|
||||
struct exfat_sb_info *sbi = fc->s_fs_info;
|
||||
|
||||
if (sbi) {
|
||||
exfat_free_iocharset(sbi);
|
||||
kfree(sbi);
|
||||
}
|
||||
}
|
||||
|
||||
static int exfat_reconfigure(struct fs_context *fc)
|
||||
{
|
||||
fc->sb_flags |= SB_NODIRATIME;
|
||||
|
||||
/* volume flag will be updated in exfat_sync_fs */
|
||||
sync_filesystem(fc->root->d_sb);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct fs_context_operations exfat_context_ops = {
|
||||
.parse_param = exfat_parse_param,
|
||||
.get_tree = exfat_get_tree,
|
||||
.free = exfat_free,
|
||||
.reconfigure = exfat_reconfigure,
|
||||
};
|
||||
|
||||
static int exfat_init_fs_context(struct fs_context *fc)
|
||||
|
|
|
|||
Loading…
Reference in a new issue