Description for this pull request:
- Improve dirsync performance by syncing on a dentry-set rather than on a per-directory entry -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE6NzKS6Uv/XAAGHgyZwv7A1FEIQgFAmX653kWHGxpbmtpbmpl b25Aa2VybmVsLm9yZwAKCRBnC/sDUUQhCMEZD/9bpRN1V5YezmQUUh928yC0OWai aEDZqmzEsrJ7wXKUYmwjCzxO9/h3CwdtWTaJMctz2XlfJ9L62hiGXki4Cc27vfgs RGDV7fHpRmRq+JxgZN+UEnfrJx6kA0xrOaoyrbvT0t8pTCyK8yOY28YsltbI8wKd yQbWS4u4r1/Gugfry7PeGA5x6fxGcP/kbjB81Q1+/ilJetqELcUH9INOGSwvfzOh k9lgF+ujJVauzP1Pbw4fSZhcfXGYu0x4rbwcUAJUvuc3NXbotKEAW/ICJW1bH5En nN7IjiCYwMjEpK7H4zaZ61zrTIfe/MYgKLsq5XWYrvAmSL8QIlJiB4gbSpwd95gc 7AK4d4mgYrF3oZPjYvb7kpbPtrNywQzIhef2W67E+fGifAKSsuI8gf+LYA2a7m5A HqTeL+3z1DnCwEGfLkNtEBy4xbv039dftjDcR8qzPs3WgwWU7G1nhwuQttcXC1qB p5eYxL1RvCbDXER9K6chdYQg7KkxCThlIGuG6shqQt4ybApyGbngmw7s3laUHMZQ 3R3eD1UqtDb3vr04/PmvQ8NbLy0js8Q2lmjIowznyO/ahpCw/++OgX7T4Q+Sse6h xfGj8YkyeXNF7t6NwXhErdygvovoXQ4ADZIcxlhSc3NKnZUzL7RDEx5yMUzKggHu BlZlCJZoOoAm5Gk9Cw== =0fPf -----END PGP SIGNATURE----- Merge tag 'exfat-for-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat Pull exfat updates from Namjae Jeon: - Improve dirsync performance by syncing on a dentry-set rather than on a per-directory entry * tag 'exfat-for-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat: exfat: remove duplicate update parent dir exfat: do not sync parent dir if just update timestamp exfat: remove unused functions exfat: convert exfat_find_empty_entry() to use dentry cache exfat: convert exfat_init_ext_entry() to use dentry cache exfat: move free cluster out of exfat_init_ext_entry() exfat: convert exfat_remove_entries() to use dentry cache exfat: convert exfat_add_entry() to use dentry cache exfat: add exfat_get_empty_dentry_set() helper exfat: add __exfat_get_dentry_set() helper
This commit is contained in:
commit
1b3e251373
290
fs/exfat/dir.c
290
fs/exfat/dir.c
|
@ -448,88 +448,34 @@ static void exfat_init_name_entry(struct exfat_dentry *ep,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int exfat_init_dir_entry(struct inode *inode, struct exfat_chain *p_dir,
|
void exfat_init_dir_entry(struct exfat_entry_set_cache *es,
|
||||||
int entry, unsigned int type, unsigned int start_clu,
|
unsigned int type, unsigned int start_clu,
|
||||||
unsigned long long size)
|
unsigned long long size, struct timespec64 *ts)
|
||||||
{
|
{
|
||||||
struct super_block *sb = inode->i_sb;
|
struct super_block *sb = es->sb;
|
||||||
struct exfat_sb_info *sbi = EXFAT_SB(sb);
|
struct exfat_sb_info *sbi = EXFAT_SB(sb);
|
||||||
struct timespec64 ts = current_time(inode);
|
|
||||||
struct exfat_dentry *ep;
|
struct exfat_dentry *ep;
|
||||||
struct buffer_head *bh;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* We cannot use exfat_get_dentry_set here because file ep is not
|
|
||||||
* initialized yet.
|
|
||||||
*/
|
|
||||||
ep = exfat_get_dentry(sb, p_dir, entry, &bh);
|
|
||||||
if (!ep)
|
|
||||||
return -EIO;
|
|
||||||
|
|
||||||
|
ep = exfat_get_dentry_cached(es, ES_IDX_FILE);
|
||||||
exfat_set_entry_type(ep, type);
|
exfat_set_entry_type(ep, type);
|
||||||
exfat_set_entry_time(sbi, &ts,
|
exfat_set_entry_time(sbi, ts,
|
||||||
&ep->dentry.file.create_tz,
|
&ep->dentry.file.create_tz,
|
||||||
&ep->dentry.file.create_time,
|
&ep->dentry.file.create_time,
|
||||||
&ep->dentry.file.create_date,
|
&ep->dentry.file.create_date,
|
||||||
&ep->dentry.file.create_time_cs);
|
&ep->dentry.file.create_time_cs);
|
||||||
exfat_set_entry_time(sbi, &ts,
|
exfat_set_entry_time(sbi, ts,
|
||||||
&ep->dentry.file.modify_tz,
|
&ep->dentry.file.modify_tz,
|
||||||
&ep->dentry.file.modify_time,
|
&ep->dentry.file.modify_time,
|
||||||
&ep->dentry.file.modify_date,
|
&ep->dentry.file.modify_date,
|
||||||
&ep->dentry.file.modify_time_cs);
|
&ep->dentry.file.modify_time_cs);
|
||||||
exfat_set_entry_time(sbi, &ts,
|
exfat_set_entry_time(sbi, ts,
|
||||||
&ep->dentry.file.access_tz,
|
&ep->dentry.file.access_tz,
|
||||||
&ep->dentry.file.access_time,
|
&ep->dentry.file.access_time,
|
||||||
&ep->dentry.file.access_date,
|
&ep->dentry.file.access_date,
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
exfat_update_bh(bh, IS_DIRSYNC(inode));
|
ep = exfat_get_dentry_cached(es, ES_IDX_STREAM);
|
||||||
brelse(bh);
|
|
||||||
|
|
||||||
ep = exfat_get_dentry(sb, p_dir, entry + 1, &bh);
|
|
||||||
if (!ep)
|
|
||||||
return -EIO;
|
|
||||||
|
|
||||||
exfat_init_stream_entry(ep, start_clu, size);
|
exfat_init_stream_entry(ep, start_clu, size);
|
||||||
exfat_update_bh(bh, IS_DIRSYNC(inode));
|
|
||||||
brelse(bh);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int exfat_update_dir_chksum(struct inode *inode, struct exfat_chain *p_dir,
|
|
||||||
int entry)
|
|
||||||
{
|
|
||||||
struct super_block *sb = inode->i_sb;
|
|
||||||
int ret = 0;
|
|
||||||
int i, num_entries;
|
|
||||||
u16 chksum;
|
|
||||||
struct exfat_dentry *ep, *fep;
|
|
||||||
struct buffer_head *fbh, *bh;
|
|
||||||
|
|
||||||
fep = exfat_get_dentry(sb, p_dir, entry, &fbh);
|
|
||||||
if (!fep)
|
|
||||||
return -EIO;
|
|
||||||
|
|
||||||
num_entries = fep->dentry.file.num_ext + 1;
|
|
||||||
chksum = exfat_calc_chksum16(fep, DENTRY_SIZE, 0, CS_DIR_ENTRY);
|
|
||||||
|
|
||||||
for (i = 1; i < num_entries; i++) {
|
|
||||||
ep = exfat_get_dentry(sb, p_dir, entry + i, &bh);
|
|
||||||
if (!ep) {
|
|
||||||
ret = -EIO;
|
|
||||||
goto release_fbh;
|
|
||||||
}
|
|
||||||
chksum = exfat_calc_chksum16(ep, DENTRY_SIZE, chksum,
|
|
||||||
CS_DEFAULT);
|
|
||||||
brelse(bh);
|
|
||||||
}
|
|
||||||
|
|
||||||
fep->dentry.file.checksum = cpu_to_le16(chksum);
|
|
||||||
exfat_update_bh(fbh, IS_DIRSYNC(inode));
|
|
||||||
release_fbh:
|
|
||||||
brelse(fbh);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void exfat_free_benign_secondary_clusters(struct inode *inode,
|
static void exfat_free_benign_secondary_clusters(struct inode *inode,
|
||||||
|
@ -551,76 +497,49 @@ static void exfat_free_benign_secondary_clusters(struct inode *inode,
|
||||||
exfat_free_cluster(inode, &dir);
|
exfat_free_cluster(inode, &dir);
|
||||||
}
|
}
|
||||||
|
|
||||||
int exfat_init_ext_entry(struct inode *inode, struct exfat_chain *p_dir,
|
void exfat_init_ext_entry(struct exfat_entry_set_cache *es, int num_entries,
|
||||||
int entry, int num_entries, struct exfat_uni_name *p_uniname)
|
struct exfat_uni_name *p_uniname)
|
||||||
{
|
{
|
||||||
struct super_block *sb = inode->i_sb;
|
|
||||||
int i;
|
int i;
|
||||||
unsigned short *uniname = p_uniname->name;
|
unsigned short *uniname = p_uniname->name;
|
||||||
struct exfat_dentry *ep;
|
struct exfat_dentry *ep;
|
||||||
struct buffer_head *bh;
|
|
||||||
int sync = IS_DIRSYNC(inode);
|
|
||||||
|
|
||||||
ep = exfat_get_dentry(sb, p_dir, entry, &bh);
|
|
||||||
if (!ep)
|
|
||||||
return -EIO;
|
|
||||||
|
|
||||||
|
ep = exfat_get_dentry_cached(es, ES_IDX_FILE);
|
||||||
ep->dentry.file.num_ext = (unsigned char)(num_entries - 1);
|
ep->dentry.file.num_ext = (unsigned char)(num_entries - 1);
|
||||||
exfat_update_bh(bh, sync);
|
|
||||||
brelse(bh);
|
|
||||||
|
|
||||||
ep = exfat_get_dentry(sb, p_dir, entry + 1, &bh);
|
|
||||||
if (!ep)
|
|
||||||
return -EIO;
|
|
||||||
|
|
||||||
|
ep = exfat_get_dentry_cached(es, ES_IDX_STREAM);
|
||||||
ep->dentry.stream.name_len = p_uniname->name_len;
|
ep->dentry.stream.name_len = p_uniname->name_len;
|
||||||
ep->dentry.stream.name_hash = cpu_to_le16(p_uniname->name_hash);
|
ep->dentry.stream.name_hash = cpu_to_le16(p_uniname->name_hash);
|
||||||
exfat_update_bh(bh, sync);
|
|
||||||
brelse(bh);
|
|
||||||
|
|
||||||
for (i = EXFAT_FIRST_CLUSTER; i < num_entries; i++) {
|
|
||||||
ep = exfat_get_dentry(sb, p_dir, entry + i, &bh);
|
|
||||||
if (!ep)
|
|
||||||
return -EIO;
|
|
||||||
|
|
||||||
if (exfat_get_entry_type(ep) & TYPE_BENIGN_SEC)
|
|
||||||
exfat_free_benign_secondary_clusters(inode, ep);
|
|
||||||
|
|
||||||
|
for (i = ES_IDX_FIRST_FILENAME; i < num_entries; i++) {
|
||||||
|
ep = exfat_get_dentry_cached(es, i);
|
||||||
exfat_init_name_entry(ep, uniname);
|
exfat_init_name_entry(ep, uniname);
|
||||||
exfat_update_bh(bh, sync);
|
|
||||||
brelse(bh);
|
|
||||||
uniname += EXFAT_FILE_NAME_LEN;
|
uniname += EXFAT_FILE_NAME_LEN;
|
||||||
}
|
}
|
||||||
|
|
||||||
exfat_update_dir_chksum(inode, p_dir, entry);
|
exfat_update_dir_chksum(es);
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int exfat_remove_entries(struct inode *inode, struct exfat_chain *p_dir,
|
void exfat_remove_entries(struct inode *inode, struct exfat_entry_set_cache *es,
|
||||||
int entry, int order, int num_entries)
|
int order)
|
||||||
{
|
{
|
||||||
struct super_block *sb = inode->i_sb;
|
|
||||||
int i;
|
int i;
|
||||||
struct exfat_dentry *ep;
|
struct exfat_dentry *ep;
|
||||||
struct buffer_head *bh;
|
|
||||||
|
|
||||||
for (i = order; i < num_entries; i++) {
|
for (i = order; i < es->num_entries; i++) {
|
||||||
ep = exfat_get_dentry(sb, p_dir, entry + i, &bh);
|
ep = exfat_get_dentry_cached(es, i);
|
||||||
if (!ep)
|
|
||||||
return -EIO;
|
|
||||||
|
|
||||||
if (exfat_get_entry_type(ep) & TYPE_BENIGN_SEC)
|
if (exfat_get_entry_type(ep) & TYPE_BENIGN_SEC)
|
||||||
exfat_free_benign_secondary_clusters(inode, ep);
|
exfat_free_benign_secondary_clusters(inode, ep);
|
||||||
|
|
||||||
exfat_set_entry_type(ep, TYPE_DELETED);
|
exfat_set_entry_type(ep, TYPE_DELETED);
|
||||||
exfat_update_bh(bh, IS_DIRSYNC(inode));
|
|
||||||
brelse(bh);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
if (order < es->num_entries)
|
||||||
|
es->modified = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void exfat_update_dir_chksum_with_entry_set(struct exfat_entry_set_cache *es)
|
void exfat_update_dir_chksum(struct exfat_entry_set_cache *es)
|
||||||
{
|
{
|
||||||
int chksum_type = CS_DIR_ENTRY, i;
|
int chksum_type = CS_DIR_ENTRY, i;
|
||||||
unsigned short chksum = 0;
|
unsigned short chksum = 0;
|
||||||
|
@ -775,7 +694,6 @@ struct exfat_dentry *exfat_get_dentry(struct super_block *sb,
|
||||||
}
|
}
|
||||||
|
|
||||||
enum exfat_validate_dentry_mode {
|
enum exfat_validate_dentry_mode {
|
||||||
ES_MODE_STARTED,
|
|
||||||
ES_MODE_GET_FILE_ENTRY,
|
ES_MODE_GET_FILE_ENTRY,
|
||||||
ES_MODE_GET_STRM_ENTRY,
|
ES_MODE_GET_STRM_ENTRY,
|
||||||
ES_MODE_GET_NAME_ENTRY,
|
ES_MODE_GET_NAME_ENTRY,
|
||||||
|
@ -790,11 +708,6 @@ static bool exfat_validate_entry(unsigned int type,
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
switch (*mode) {
|
switch (*mode) {
|
||||||
case ES_MODE_STARTED:
|
|
||||||
if (type != TYPE_FILE && type != TYPE_DIR)
|
|
||||||
return false;
|
|
||||||
*mode = ES_MODE_GET_FILE_ENTRY;
|
|
||||||
break;
|
|
||||||
case ES_MODE_GET_FILE_ENTRY:
|
case ES_MODE_GET_FILE_ENTRY:
|
||||||
if (type != TYPE_STREAM)
|
if (type != TYPE_STREAM)
|
||||||
return false;
|
return false;
|
||||||
|
@ -834,7 +747,7 @@ struct exfat_dentry *exfat_get_dentry_cached(
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Returns a set of dentries for a file or dir.
|
* Returns a set of dentries.
|
||||||
*
|
*
|
||||||
* Note It provides a direct pointer to bh->data via exfat_get_dentry_cached().
|
* Note It provides a direct pointer to bh->data via exfat_get_dentry_cached().
|
||||||
* User should call exfat_get_dentry_set() after setting 'modified' to apply
|
* User should call exfat_get_dentry_set() after setting 'modified' to apply
|
||||||
|
@ -842,22 +755,24 @@ struct exfat_dentry *exfat_get_dentry_cached(
|
||||||
*
|
*
|
||||||
* in:
|
* in:
|
||||||
* sb+p_dir+entry: indicates a file/dir
|
* sb+p_dir+entry: indicates a file/dir
|
||||||
* type: specifies how many dentries should be included.
|
* num_entries: specifies how many dentries should be included.
|
||||||
|
* It will be set to es->num_entries if it is not 0.
|
||||||
|
* If num_entries is 0, es->num_entries will be obtained
|
||||||
|
* from the first dentry.
|
||||||
|
* out:
|
||||||
|
* es: pointer of entry set on success.
|
||||||
* return:
|
* return:
|
||||||
* pointer of entry set on success,
|
* 0 on success
|
||||||
* NULL on failure.
|
* -error code on failure
|
||||||
*/
|
*/
|
||||||
int exfat_get_dentry_set(struct exfat_entry_set_cache *es,
|
static int __exfat_get_dentry_set(struct exfat_entry_set_cache *es,
|
||||||
struct super_block *sb, struct exfat_chain *p_dir, int entry,
|
struct super_block *sb, struct exfat_chain *p_dir, int entry,
|
||||||
unsigned int type)
|
unsigned int num_entries)
|
||||||
{
|
{
|
||||||
int ret, i, num_bh;
|
int ret, i, num_bh;
|
||||||
unsigned int off;
|
unsigned int off;
|
||||||
sector_t sec;
|
sector_t sec;
|
||||||
struct exfat_sb_info *sbi = EXFAT_SB(sb);
|
struct exfat_sb_info *sbi = EXFAT_SB(sb);
|
||||||
struct exfat_dentry *ep;
|
|
||||||
int num_entries;
|
|
||||||
enum exfat_validate_dentry_mode mode = ES_MODE_STARTED;
|
|
||||||
struct buffer_head *bh;
|
struct buffer_head *bh;
|
||||||
|
|
||||||
if (p_dir->dir == DIR_DELETED) {
|
if (p_dir->dir == DIR_DELETED) {
|
||||||
|
@ -880,12 +795,18 @@ int exfat_get_dentry_set(struct exfat_entry_set_cache *es,
|
||||||
return -EIO;
|
return -EIO;
|
||||||
es->bh[es->num_bh++] = bh;
|
es->bh[es->num_bh++] = bh;
|
||||||
|
|
||||||
ep = exfat_get_dentry_cached(es, ES_IDX_FILE);
|
if (num_entries == ES_ALL_ENTRIES) {
|
||||||
if (!exfat_validate_entry(exfat_get_entry_type(ep), &mode))
|
struct exfat_dentry *ep;
|
||||||
goto put_es;
|
|
||||||
|
ep = exfat_get_dentry_cached(es, ES_IDX_FILE);
|
||||||
|
if (ep->type != EXFAT_FILE) {
|
||||||
|
brelse(bh);
|
||||||
|
return -EIO;
|
||||||
|
}
|
||||||
|
|
||||||
|
num_entries = ep->dentry.file.num_ext + 1;
|
||||||
|
}
|
||||||
|
|
||||||
num_entries = type == ES_ALL_ENTRIES ?
|
|
||||||
ep->dentry.file.num_ext + 1 : type;
|
|
||||||
es->num_entries = num_entries;
|
es->num_entries = num_entries;
|
||||||
|
|
||||||
num_bh = EXFAT_B_TO_BLK_ROUND_UP(off + num_entries * DENTRY_SIZE, sb);
|
num_bh = EXFAT_B_TO_BLK_ROUND_UP(off + num_entries * DENTRY_SIZE, sb);
|
||||||
|
@ -918,8 +839,27 @@ int exfat_get_dentry_set(struct exfat_entry_set_cache *es,
|
||||||
es->bh[es->num_bh++] = bh;
|
es->bh[es->num_bh++] = bh;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
put_es:
|
||||||
|
exfat_put_dentry_set(es, false);
|
||||||
|
return -EIO;
|
||||||
|
}
|
||||||
|
|
||||||
|
int exfat_get_dentry_set(struct exfat_entry_set_cache *es,
|
||||||
|
struct super_block *sb, struct exfat_chain *p_dir,
|
||||||
|
int entry, unsigned int num_entries)
|
||||||
|
{
|
||||||
|
int ret, i;
|
||||||
|
struct exfat_dentry *ep;
|
||||||
|
enum exfat_validate_dentry_mode mode = ES_MODE_GET_FILE_ENTRY;
|
||||||
|
|
||||||
|
ret = __exfat_get_dentry_set(es, sb, p_dir, entry, num_entries);
|
||||||
|
if (ret < 0)
|
||||||
|
return ret;
|
||||||
|
|
||||||
/* validate cached dentries */
|
/* validate cached dentries */
|
||||||
for (i = ES_IDX_STREAM; i < num_entries; i++) {
|
for (i = ES_IDX_STREAM; i < es->num_entries; i++) {
|
||||||
ep = exfat_get_dentry_cached(es, i);
|
ep = exfat_get_dentry_cached(es, i);
|
||||||
if (!exfat_validate_entry(exfat_get_entry_type(ep), &mode))
|
if (!exfat_validate_entry(exfat_get_entry_type(ep), &mode))
|
||||||
goto put_es;
|
goto put_es;
|
||||||
|
@ -931,6 +871,85 @@ put_es:
|
||||||
return -EIO;
|
return -EIO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int exfat_validate_empty_dentry_set(struct exfat_entry_set_cache *es)
|
||||||
|
{
|
||||||
|
struct exfat_dentry *ep;
|
||||||
|
struct buffer_head *bh;
|
||||||
|
int i, off;
|
||||||
|
bool unused_hit = false;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* ONLY UNUSED OR DELETED DENTRIES ARE ALLOWED:
|
||||||
|
* Although it violates the specification for a deleted entry to
|
||||||
|
* follow an unused entry, some exFAT implementations could work
|
||||||
|
* like this. Therefore, to improve compatibility, let's allow it.
|
||||||
|
*/
|
||||||
|
for (i = 0; i < es->num_entries; i++) {
|
||||||
|
ep = exfat_get_dentry_cached(es, i);
|
||||||
|
if (ep->type == EXFAT_UNUSED) {
|
||||||
|
unused_hit = true;
|
||||||
|
} else if (!IS_EXFAT_DELETED(ep->type)) {
|
||||||
|
if (unused_hit)
|
||||||
|
goto err_used_follow_unused;
|
||||||
|
i++;
|
||||||
|
goto count_skip_entries;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
err_used_follow_unused:
|
||||||
|
off = es->start_off + (i << DENTRY_SIZE_BITS);
|
||||||
|
bh = es->bh[EXFAT_B_TO_BLK(off, es->sb)];
|
||||||
|
|
||||||
|
exfat_fs_error(es->sb,
|
||||||
|
"in sector %lld, dentry %d should be unused, but 0x%x",
|
||||||
|
bh->b_blocknr, off >> DENTRY_SIZE_BITS, ep->type);
|
||||||
|
|
||||||
|
return -EIO;
|
||||||
|
|
||||||
|
count_skip_entries:
|
||||||
|
es->num_entries = EXFAT_B_TO_DEN(EXFAT_BLK_TO_B(es->num_bh, es->sb) - es->start_off);
|
||||||
|
for (; i < es->num_entries; i++) {
|
||||||
|
ep = exfat_get_dentry_cached(es, i);
|
||||||
|
if (IS_EXFAT_DELETED(ep->type))
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return i;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Get an empty dentry set.
|
||||||
|
*
|
||||||
|
* in:
|
||||||
|
* sb+p_dir+entry: indicates the empty dentry location
|
||||||
|
* num_entries: specifies how many empty dentries should be included.
|
||||||
|
* out:
|
||||||
|
* es: pointer of empty dentry set on success.
|
||||||
|
* return:
|
||||||
|
* 0 : on success
|
||||||
|
* >0 : the dentries are not empty, the return value is the number of
|
||||||
|
* dentries to be skipped for the next lookup.
|
||||||
|
* <0 : on failure
|
||||||
|
*/
|
||||||
|
int exfat_get_empty_dentry_set(struct exfat_entry_set_cache *es,
|
||||||
|
struct super_block *sb, struct exfat_chain *p_dir,
|
||||||
|
int entry, unsigned int num_entries)
|
||||||
|
{
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
ret = __exfat_get_dentry_set(es, sb, p_dir, entry, num_entries);
|
||||||
|
if (ret < 0)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
ret = exfat_validate_empty_dentry_set(es);
|
||||||
|
if (ret)
|
||||||
|
exfat_put_dentry_set(es, false);
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
static inline void exfat_reset_empty_hint(struct exfat_hint_femp *hint_femp)
|
static inline void exfat_reset_empty_hint(struct exfat_hint_femp *hint_femp)
|
||||||
{
|
{
|
||||||
hint_femp->eidx = EXFAT_HINT_NONE;
|
hint_femp->eidx = EXFAT_HINT_NONE;
|
||||||
|
@ -1187,27 +1206,6 @@ found:
|
||||||
return dentry - num_ext;
|
return dentry - num_ext;
|
||||||
}
|
}
|
||||||
|
|
||||||
int exfat_count_ext_entries(struct super_block *sb, struct exfat_chain *p_dir,
|
|
||||||
int entry, struct exfat_dentry *ep)
|
|
||||||
{
|
|
||||||
int i, count = 0;
|
|
||||||
unsigned int type;
|
|
||||||
struct exfat_dentry *ext_ep;
|
|
||||||
struct buffer_head *bh;
|
|
||||||
|
|
||||||
for (i = 0, entry++; i < ep->dentry.file.num_ext; i++, entry++) {
|
|
||||||
ext_ep = exfat_get_dentry(sb, p_dir, entry, &bh);
|
|
||||||
if (!ext_ep)
|
|
||||||
return -EIO;
|
|
||||||
|
|
||||||
type = exfat_get_entry_type(ext_ep);
|
|
||||||
brelse(bh);
|
|
||||||
if (type & TYPE_CRITICAL_SEC || type & TYPE_BENIGN_SEC)
|
|
||||||
count++;
|
|
||||||
}
|
|
||||||
return count;
|
|
||||||
}
|
|
||||||
|
|
||||||
int exfat_count_dir_entries(struct super_block *sb, struct exfat_chain *p_dir)
|
int exfat_count_dir_entries(struct super_block *sb, struct exfat_chain *p_dir)
|
||||||
{
|
{
|
||||||
int i, count = 0;
|
int i, count = 0;
|
||||||
|
|
|
@ -431,8 +431,6 @@ int exfat_ent_get(struct super_block *sb, unsigned int loc,
|
||||||
unsigned int *content);
|
unsigned int *content);
|
||||||
int exfat_ent_set(struct super_block *sb, unsigned int loc,
|
int exfat_ent_set(struct super_block *sb, unsigned int loc,
|
||||||
unsigned int content);
|
unsigned int content);
|
||||||
int exfat_count_ext_entries(struct super_block *sb, struct exfat_chain *p_dir,
|
|
||||||
int entry, struct exfat_dentry *p_entry);
|
|
||||||
int exfat_chain_cont_cluster(struct super_block *sb, unsigned int chain,
|
int exfat_chain_cont_cluster(struct super_block *sb, unsigned int chain,
|
||||||
unsigned int len);
|
unsigned int len);
|
||||||
int exfat_zeroed_cluster(struct inode *dir, unsigned int clu);
|
int exfat_zeroed_cluster(struct inode *dir, unsigned int clu);
|
||||||
|
@ -480,16 +478,14 @@ int exfat_get_cluster(struct inode *inode, unsigned int cluster,
|
||||||
extern const struct inode_operations exfat_dir_inode_operations;
|
extern const struct inode_operations exfat_dir_inode_operations;
|
||||||
extern const struct file_operations exfat_dir_operations;
|
extern const struct file_operations exfat_dir_operations;
|
||||||
unsigned int exfat_get_entry_type(struct exfat_dentry *p_entry);
|
unsigned int exfat_get_entry_type(struct exfat_dentry *p_entry);
|
||||||
int exfat_init_dir_entry(struct inode *inode, struct exfat_chain *p_dir,
|
void exfat_init_dir_entry(struct exfat_entry_set_cache *es,
|
||||||
int entry, unsigned int type, unsigned int start_clu,
|
unsigned int type, unsigned int start_clu,
|
||||||
unsigned long long size);
|
unsigned long long size, struct timespec64 *ts);
|
||||||
int exfat_init_ext_entry(struct inode *inode, struct exfat_chain *p_dir,
|
void exfat_init_ext_entry(struct exfat_entry_set_cache *es, int num_entries,
|
||||||
int entry, int num_entries, struct exfat_uni_name *p_uniname);
|
struct exfat_uni_name *p_uniname);
|
||||||
int exfat_remove_entries(struct inode *inode, struct exfat_chain *p_dir,
|
void exfat_remove_entries(struct inode *inode, struct exfat_entry_set_cache *es,
|
||||||
int entry, int order, int num_entries);
|
int order);
|
||||||
int exfat_update_dir_chksum(struct inode *inode, struct exfat_chain *p_dir,
|
void exfat_update_dir_chksum(struct exfat_entry_set_cache *es);
|
||||||
int entry);
|
|
||||||
void exfat_update_dir_chksum_with_entry_set(struct exfat_entry_set_cache *es);
|
|
||||||
int exfat_calc_num_entries(struct exfat_uni_name *p_uniname);
|
int exfat_calc_num_entries(struct exfat_uni_name *p_uniname);
|
||||||
int exfat_find_dir_entry(struct super_block *sb, struct exfat_inode_info *ei,
|
int exfat_find_dir_entry(struct super_block *sb, struct exfat_inode_info *ei,
|
||||||
struct exfat_chain *p_dir, struct exfat_uni_name *p_uniname,
|
struct exfat_chain *p_dir, struct exfat_uni_name *p_uniname,
|
||||||
|
@ -501,7 +497,10 @@ struct exfat_dentry *exfat_get_dentry_cached(struct exfat_entry_set_cache *es,
|
||||||
int num);
|
int num);
|
||||||
int exfat_get_dentry_set(struct exfat_entry_set_cache *es,
|
int exfat_get_dentry_set(struct exfat_entry_set_cache *es,
|
||||||
struct super_block *sb, struct exfat_chain *p_dir, int entry,
|
struct super_block *sb, struct exfat_chain *p_dir, int entry,
|
||||||
unsigned int type);
|
unsigned int num_entries);
|
||||||
|
int exfat_get_empty_dentry_set(struct exfat_entry_set_cache *es,
|
||||||
|
struct super_block *sb, struct exfat_chain *p_dir, int entry,
|
||||||
|
unsigned int num_entries);
|
||||||
int exfat_put_dentry_set(struct exfat_entry_set_cache *es, int sync);
|
int exfat_put_dentry_set(struct exfat_entry_set_cache *es, int sync);
|
||||||
int exfat_count_dir_entries(struct super_block *sb, struct exfat_chain *p_dir);
|
int exfat_count_dir_entries(struct super_block *sb, struct exfat_chain *p_dir);
|
||||||
|
|
||||||
|
|
|
@ -94,7 +94,7 @@ int __exfat_write_inode(struct inode *inode, int sync)
|
||||||
ep2->dentry.stream.start_clu = EXFAT_FREE_CLUSTER;
|
ep2->dentry.stream.start_clu = EXFAT_FREE_CLUSTER;
|
||||||
}
|
}
|
||||||
|
|
||||||
exfat_update_dir_chksum_with_entry_set(&es);
|
exfat_update_dir_chksum(&es);
|
||||||
return exfat_put_dentry_set(&es, sync);
|
return exfat_put_dentry_set(&es, sync);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
348
fs/exfat/namei.c
348
fs/exfat/namei.c
|
@ -204,21 +204,16 @@ const struct dentry_operations exfat_utf8_dentry_ops = {
|
||||||
.d_compare = exfat_utf8_d_cmp,
|
.d_compare = exfat_utf8_d_cmp,
|
||||||
};
|
};
|
||||||
|
|
||||||
/* used only in search empty_slot() */
|
|
||||||
#define CNT_UNUSED_NOHIT (-1)
|
|
||||||
#define CNT_UNUSED_HIT (-2)
|
|
||||||
/* search EMPTY CONTINUOUS "num_entries" entries */
|
/* search EMPTY CONTINUOUS "num_entries" entries */
|
||||||
static int exfat_search_empty_slot(struct super_block *sb,
|
static int exfat_search_empty_slot(struct super_block *sb,
|
||||||
struct exfat_hint_femp *hint_femp, struct exfat_chain *p_dir,
|
struct exfat_hint_femp *hint_femp, struct exfat_chain *p_dir,
|
||||||
int num_entries)
|
int num_entries, struct exfat_entry_set_cache *es)
|
||||||
{
|
{
|
||||||
int i, dentry, num_empty = 0;
|
int i, dentry, ret;
|
||||||
int dentries_per_clu;
|
int dentries_per_clu;
|
||||||
unsigned int type;
|
|
||||||
struct exfat_chain clu;
|
struct exfat_chain clu;
|
||||||
struct exfat_dentry *ep;
|
|
||||||
struct exfat_sb_info *sbi = EXFAT_SB(sb);
|
struct exfat_sb_info *sbi = EXFAT_SB(sb);
|
||||||
struct buffer_head *bh;
|
int total_entries = EXFAT_CLU_TO_DEN(p_dir->size, sbi);
|
||||||
|
|
||||||
dentries_per_clu = sbi->dentries_per_clu;
|
dentries_per_clu = sbi->dentries_per_clu;
|
||||||
|
|
||||||
|
@ -231,7 +226,7 @@ static int exfat_search_empty_slot(struct super_block *sb,
|
||||||
* Otherwise, and if "dentry + hint_famp->count" is also equal
|
* Otherwise, and if "dentry + hint_famp->count" is also equal
|
||||||
* to "p_dir->size * dentries_per_clu", it means ENOSPC.
|
* to "p_dir->size * dentries_per_clu", it means ENOSPC.
|
||||||
*/
|
*/
|
||||||
if (dentry + hint_femp->count == p_dir->size * dentries_per_clu &&
|
if (dentry + hint_femp->count == total_entries &&
|
||||||
num_entries > hint_femp->count)
|
num_entries > hint_femp->count)
|
||||||
return -ENOSPC;
|
return -ENOSPC;
|
||||||
|
|
||||||
|
@ -242,69 +237,41 @@ static int exfat_search_empty_slot(struct super_block *sb,
|
||||||
dentry = 0;
|
dentry = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
while (clu.dir != EXFAT_EOF_CLUSTER) {
|
while (dentry + num_entries < total_entries &&
|
||||||
|
clu.dir != EXFAT_EOF_CLUSTER) {
|
||||||
i = dentry & (dentries_per_clu - 1);
|
i = dentry & (dentries_per_clu - 1);
|
||||||
|
|
||||||
for (; i < dentries_per_clu; i++, dentry++) {
|
ret = exfat_get_empty_dentry_set(es, sb, &clu, i, num_entries);
|
||||||
ep = exfat_get_dentry(sb, &clu, i, &bh);
|
if (ret < 0)
|
||||||
if (!ep)
|
return ret;
|
||||||
return -EIO;
|
else if (ret == 0)
|
||||||
type = exfat_get_entry_type(ep);
|
return dentry;
|
||||||
brelse(bh);
|
|
||||||
|
|
||||||
if (type == TYPE_UNUSED || type == TYPE_DELETED) {
|
dentry += ret;
|
||||||
num_empty++;
|
i += ret;
|
||||||
if (hint_femp->eidx == EXFAT_HINT_NONE) {
|
|
||||||
hint_femp->eidx = dentry;
|
|
||||||
hint_femp->count = CNT_UNUSED_NOHIT;
|
|
||||||
exfat_chain_set(&hint_femp->cur,
|
|
||||||
clu.dir, clu.size, clu.flags);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (type == TYPE_UNUSED &&
|
while (i >= dentries_per_clu) {
|
||||||
hint_femp->count != CNT_UNUSED_HIT)
|
if (clu.flags == ALLOC_NO_FAT_CHAIN) {
|
||||||
hint_femp->count = CNT_UNUSED_HIT;
|
if (--clu.size > 0)
|
||||||
|
clu.dir++;
|
||||||
|
else
|
||||||
|
clu.dir = EXFAT_EOF_CLUSTER;
|
||||||
} else {
|
} else {
|
||||||
if (hint_femp->eidx != EXFAT_HINT_NONE &&
|
if (exfat_get_next_cluster(sb, &clu.dir))
|
||||||
hint_femp->count == CNT_UNUSED_HIT) {
|
|
||||||
/* unused empty group means
|
|
||||||
* an empty group which includes
|
|
||||||
* unused dentry
|
|
||||||
*/
|
|
||||||
exfat_fs_error(sb,
|
|
||||||
"found bogus dentry(%d) beyond unused empty group(%d) (start_clu : %u, cur_clu : %u)",
|
|
||||||
dentry, hint_femp->eidx,
|
|
||||||
p_dir->dir, clu.dir);
|
|
||||||
return -EIO;
|
return -EIO;
|
||||||
}
|
|
||||||
|
|
||||||
num_empty = 0;
|
|
||||||
hint_femp->eidx = EXFAT_HINT_NONE;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (num_empty >= num_entries) {
|
i -= dentries_per_clu;
|
||||||
/* found and invalidate hint_femp */
|
|
||||||
hint_femp->eidx = EXFAT_HINT_NONE;
|
|
||||||
return (dentry - (num_entries - 1));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (clu.flags == ALLOC_NO_FAT_CHAIN) {
|
|
||||||
if (--clu.size > 0)
|
|
||||||
clu.dir++;
|
|
||||||
else
|
|
||||||
clu.dir = EXFAT_EOF_CLUSTER;
|
|
||||||
} else {
|
|
||||||
if (exfat_get_next_cluster(sb, &clu.dir))
|
|
||||||
return -EIO;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
hint_femp->eidx = p_dir->size * dentries_per_clu - num_empty;
|
hint_femp->eidx = dentry;
|
||||||
hint_femp->count = num_empty;
|
hint_femp->count = 0;
|
||||||
if (num_empty == 0)
|
if (dentry == total_entries || clu.dir == EXFAT_EOF_CLUSTER)
|
||||||
exfat_chain_set(&hint_femp->cur, EXFAT_EOF_CLUSTER, 0,
|
exfat_chain_set(&hint_femp->cur, EXFAT_EOF_CLUSTER, 0,
|
||||||
clu.flags);
|
clu.flags);
|
||||||
|
else
|
||||||
|
hint_femp->cur = clu;
|
||||||
|
|
||||||
return -ENOSPC;
|
return -ENOSPC;
|
||||||
}
|
}
|
||||||
|
@ -325,7 +292,8 @@ static int exfat_check_max_dentries(struct inode *inode)
|
||||||
* if there isn't any empty slot, expand cluster chain.
|
* if there isn't any empty slot, expand cluster chain.
|
||||||
*/
|
*/
|
||||||
static int exfat_find_empty_entry(struct inode *inode,
|
static int exfat_find_empty_entry(struct inode *inode,
|
||||||
struct exfat_chain *p_dir, int num_entries)
|
struct exfat_chain *p_dir, int num_entries,
|
||||||
|
struct exfat_entry_set_cache *es)
|
||||||
{
|
{
|
||||||
int dentry;
|
int dentry;
|
||||||
unsigned int ret, last_clu;
|
unsigned int ret, last_clu;
|
||||||
|
@ -344,7 +312,7 @@ static int exfat_find_empty_entry(struct inode *inode,
|
||||||
}
|
}
|
||||||
|
|
||||||
while ((dentry = exfat_search_empty_slot(sb, &hint_femp, p_dir,
|
while ((dentry = exfat_search_empty_slot(sb, &hint_femp, p_dir,
|
||||||
num_entries)) < 0) {
|
num_entries, es)) < 0) {
|
||||||
if (dentry == -EIO)
|
if (dentry == -EIO)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -499,6 +467,8 @@ static int exfat_add_entry(struct inode *inode, const char *path,
|
||||||
struct exfat_sb_info *sbi = EXFAT_SB(sb);
|
struct exfat_sb_info *sbi = EXFAT_SB(sb);
|
||||||
struct exfat_uni_name uniname;
|
struct exfat_uni_name uniname;
|
||||||
struct exfat_chain clu;
|
struct exfat_chain clu;
|
||||||
|
struct timespec64 ts = current_time(inode);
|
||||||
|
struct exfat_entry_set_cache es;
|
||||||
int clu_size = 0;
|
int clu_size = 0;
|
||||||
unsigned int start_clu = EXFAT_FREE_CLUSTER;
|
unsigned int start_clu = EXFAT_FREE_CLUSTER;
|
||||||
|
|
||||||
|
@ -513,7 +483,7 @@ static int exfat_add_entry(struct inode *inode, const char *path,
|
||||||
}
|
}
|
||||||
|
|
||||||
/* exfat_find_empty_entry must be called before alloc_cluster() */
|
/* exfat_find_empty_entry must be called before alloc_cluster() */
|
||||||
dentry = exfat_find_empty_entry(inode, p_dir, num_entries);
|
dentry = exfat_find_empty_entry(inode, p_dir, num_entries, &es);
|
||||||
if (dentry < 0) {
|
if (dentry < 0) {
|
||||||
ret = dentry; /* -EIO or -ENOSPC */
|
ret = dentry; /* -EIO or -ENOSPC */
|
||||||
goto out;
|
goto out;
|
||||||
|
@ -521,8 +491,10 @@ static int exfat_add_entry(struct inode *inode, const char *path,
|
||||||
|
|
||||||
if (type == TYPE_DIR && !sbi->options.zero_size_dir) {
|
if (type == TYPE_DIR && !sbi->options.zero_size_dir) {
|
||||||
ret = exfat_alloc_new_dir(inode, &clu);
|
ret = exfat_alloc_new_dir(inode, &clu);
|
||||||
if (ret)
|
if (ret) {
|
||||||
|
exfat_put_dentry_set(&es, false);
|
||||||
goto out;
|
goto out;
|
||||||
|
}
|
||||||
start_clu = clu.dir;
|
start_clu = clu.dir;
|
||||||
clu_size = sbi->cluster_size;
|
clu_size = sbi->cluster_size;
|
||||||
}
|
}
|
||||||
|
@ -531,12 +503,10 @@ static int exfat_add_entry(struct inode *inode, const char *path,
|
||||||
/* fill the dos name directory entry information of the created file.
|
/* fill the dos name directory entry information of the created file.
|
||||||
* the first cluster is not determined yet. (0)
|
* the first cluster is not determined yet. (0)
|
||||||
*/
|
*/
|
||||||
ret = exfat_init_dir_entry(inode, p_dir, dentry, type,
|
exfat_init_dir_entry(&es, type, start_clu, clu_size, &ts);
|
||||||
start_clu, clu_size);
|
exfat_init_ext_entry(&es, num_entries, &uniname);
|
||||||
if (ret)
|
|
||||||
goto out;
|
|
||||||
|
|
||||||
ret = exfat_init_ext_entry(inode, p_dir, dentry, num_entries, &uniname);
|
ret = exfat_put_dentry_set(&es, IS_DIRSYNC(inode));
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
@ -577,6 +547,7 @@ static int exfat_create(struct mnt_idmap *idmap, struct inode *dir,
|
||||||
struct exfat_dir_entry info;
|
struct exfat_dir_entry info;
|
||||||
loff_t i_pos;
|
loff_t i_pos;
|
||||||
int err;
|
int err;
|
||||||
|
loff_t size = i_size_read(dir);
|
||||||
|
|
||||||
mutex_lock(&EXFAT_SB(sb)->s_lock);
|
mutex_lock(&EXFAT_SB(sb)->s_lock);
|
||||||
exfat_set_volume_dirty(sb);
|
exfat_set_volume_dirty(sb);
|
||||||
|
@ -587,7 +558,7 @@ static int exfat_create(struct mnt_idmap *idmap, struct inode *dir,
|
||||||
|
|
||||||
inode_inc_iversion(dir);
|
inode_inc_iversion(dir);
|
||||||
inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
|
inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
|
||||||
if (IS_DIRSYNC(dir))
|
if (IS_DIRSYNC(dir) && size != i_size_read(dir))
|
||||||
exfat_sync_inode(dir);
|
exfat_sync_inode(dir);
|
||||||
else
|
else
|
||||||
mark_inode_dirty(dir);
|
mark_inode_dirty(dir);
|
||||||
|
@ -795,12 +766,11 @@ unlock:
|
||||||
static int exfat_unlink(struct inode *dir, struct dentry *dentry)
|
static int exfat_unlink(struct inode *dir, struct dentry *dentry)
|
||||||
{
|
{
|
||||||
struct exfat_chain cdir;
|
struct exfat_chain cdir;
|
||||||
struct exfat_dentry *ep;
|
|
||||||
struct super_block *sb = dir->i_sb;
|
struct super_block *sb = dir->i_sb;
|
||||||
struct inode *inode = dentry->d_inode;
|
struct inode *inode = dentry->d_inode;
|
||||||
struct exfat_inode_info *ei = EXFAT_I(inode);
|
struct exfat_inode_info *ei = EXFAT_I(inode);
|
||||||
struct buffer_head *bh;
|
struct exfat_entry_set_cache es;
|
||||||
int num_entries, entry, err = 0;
|
int entry, err = 0;
|
||||||
|
|
||||||
mutex_lock(&EXFAT_SB(sb)->s_lock);
|
mutex_lock(&EXFAT_SB(sb)->s_lock);
|
||||||
exfat_chain_dup(&cdir, &ei->dir);
|
exfat_chain_dup(&cdir, &ei->dir);
|
||||||
|
@ -811,26 +781,20 @@ static int exfat_unlink(struct inode *dir, struct dentry *dentry)
|
||||||
goto unlock;
|
goto unlock;
|
||||||
}
|
}
|
||||||
|
|
||||||
ep = exfat_get_dentry(sb, &cdir, entry, &bh);
|
err = exfat_get_dentry_set(&es, sb, &cdir, entry, ES_ALL_ENTRIES);
|
||||||
if (!ep) {
|
if (err) {
|
||||||
err = -EIO;
|
err = -EIO;
|
||||||
goto unlock;
|
goto unlock;
|
||||||
}
|
}
|
||||||
num_entries = exfat_count_ext_entries(sb, &cdir, entry, ep);
|
|
||||||
if (num_entries < 0) {
|
|
||||||
err = -EIO;
|
|
||||||
brelse(bh);
|
|
||||||
goto unlock;
|
|
||||||
}
|
|
||||||
num_entries++;
|
|
||||||
brelse(bh);
|
|
||||||
|
|
||||||
exfat_set_volume_dirty(sb);
|
exfat_set_volume_dirty(sb);
|
||||||
|
|
||||||
/* update the directory entry */
|
/* update the directory entry */
|
||||||
if (exfat_remove_entries(dir, &cdir, entry, 0, num_entries)) {
|
exfat_remove_entries(inode, &es, ES_IDX_FILE);
|
||||||
err = -EIO;
|
|
||||||
|
err = exfat_put_dentry_set(&es, IS_DIRSYNC(inode));
|
||||||
|
if (err)
|
||||||
goto unlock;
|
goto unlock;
|
||||||
}
|
|
||||||
|
|
||||||
/* This doesn't modify ei */
|
/* This doesn't modify ei */
|
||||||
ei->dir.dir = DIR_DELETED;
|
ei->dir.dir = DIR_DELETED;
|
||||||
|
@ -838,10 +802,7 @@ static int exfat_unlink(struct inode *dir, struct dentry *dentry)
|
||||||
inode_inc_iversion(dir);
|
inode_inc_iversion(dir);
|
||||||
simple_inode_init_ts(dir);
|
simple_inode_init_ts(dir);
|
||||||
exfat_truncate_inode_atime(dir);
|
exfat_truncate_inode_atime(dir);
|
||||||
if (IS_DIRSYNC(dir))
|
mark_inode_dirty(dir);
|
||||||
exfat_sync_inode(dir);
|
|
||||||
else
|
|
||||||
mark_inode_dirty(dir);
|
|
||||||
|
|
||||||
clear_nlink(inode);
|
clear_nlink(inode);
|
||||||
simple_inode_init_ts(inode);
|
simple_inode_init_ts(inode);
|
||||||
|
@ -862,6 +823,7 @@ static int exfat_mkdir(struct mnt_idmap *idmap, struct inode *dir,
|
||||||
struct exfat_chain cdir;
|
struct exfat_chain cdir;
|
||||||
loff_t i_pos;
|
loff_t i_pos;
|
||||||
int err;
|
int err;
|
||||||
|
loff_t size = i_size_read(dir);
|
||||||
|
|
||||||
mutex_lock(&EXFAT_SB(sb)->s_lock);
|
mutex_lock(&EXFAT_SB(sb)->s_lock);
|
||||||
exfat_set_volume_dirty(sb);
|
exfat_set_volume_dirty(sb);
|
||||||
|
@ -872,7 +834,7 @@ static int exfat_mkdir(struct mnt_idmap *idmap, struct inode *dir,
|
||||||
|
|
||||||
inode_inc_iversion(dir);
|
inode_inc_iversion(dir);
|
||||||
inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
|
inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
|
||||||
if (IS_DIRSYNC(dir))
|
if (IS_DIRSYNC(dir) && size != i_size_read(dir))
|
||||||
exfat_sync_inode(dir);
|
exfat_sync_inode(dir);
|
||||||
else
|
else
|
||||||
mark_inode_dirty(dir);
|
mark_inode_dirty(dir);
|
||||||
|
@ -946,13 +908,12 @@ static int exfat_check_dir_empty(struct super_block *sb,
|
||||||
static int exfat_rmdir(struct inode *dir, struct dentry *dentry)
|
static int exfat_rmdir(struct inode *dir, struct dentry *dentry)
|
||||||
{
|
{
|
||||||
struct inode *inode = dentry->d_inode;
|
struct inode *inode = dentry->d_inode;
|
||||||
struct exfat_dentry *ep;
|
|
||||||
struct exfat_chain cdir, clu_to_free;
|
struct exfat_chain cdir, clu_to_free;
|
||||||
struct super_block *sb = inode->i_sb;
|
struct super_block *sb = inode->i_sb;
|
||||||
struct exfat_sb_info *sbi = EXFAT_SB(sb);
|
struct exfat_sb_info *sbi = EXFAT_SB(sb);
|
||||||
struct exfat_inode_info *ei = EXFAT_I(inode);
|
struct exfat_inode_info *ei = EXFAT_I(inode);
|
||||||
struct buffer_head *bh;
|
struct exfat_entry_set_cache es;
|
||||||
int num_entries, entry, err;
|
int entry, err;
|
||||||
|
|
||||||
mutex_lock(&EXFAT_SB(inode->i_sb)->s_lock);
|
mutex_lock(&EXFAT_SB(inode->i_sb)->s_lock);
|
||||||
|
|
||||||
|
@ -976,27 +937,20 @@ static int exfat_rmdir(struct inode *dir, struct dentry *dentry)
|
||||||
goto unlock;
|
goto unlock;
|
||||||
}
|
}
|
||||||
|
|
||||||
ep = exfat_get_dentry(sb, &cdir, entry, &bh);
|
err = exfat_get_dentry_set(&es, sb, &cdir, entry, ES_ALL_ENTRIES);
|
||||||
if (!ep) {
|
if (err) {
|
||||||
err = -EIO;
|
err = -EIO;
|
||||||
goto unlock;
|
goto unlock;
|
||||||
}
|
}
|
||||||
|
|
||||||
num_entries = exfat_count_ext_entries(sb, &cdir, entry, ep);
|
|
||||||
if (num_entries < 0) {
|
|
||||||
err = -EIO;
|
|
||||||
brelse(bh);
|
|
||||||
goto unlock;
|
|
||||||
}
|
|
||||||
num_entries++;
|
|
||||||
brelse(bh);
|
|
||||||
|
|
||||||
exfat_set_volume_dirty(sb);
|
exfat_set_volume_dirty(sb);
|
||||||
err = exfat_remove_entries(dir, &cdir, entry, 0, num_entries);
|
|
||||||
if (err) {
|
exfat_remove_entries(inode, &es, ES_IDX_FILE);
|
||||||
exfat_err(sb, "failed to exfat_remove_entries : err(%d)", err);
|
|
||||||
|
err = exfat_put_dentry_set(&es, IS_DIRSYNC(dir));
|
||||||
|
if (err)
|
||||||
goto unlock;
|
goto unlock;
|
||||||
}
|
|
||||||
ei->dir.dir = DIR_DELETED;
|
ei->dir.dir = DIR_DELETED;
|
||||||
|
|
||||||
inode_inc_iversion(dir);
|
inode_inc_iversion(dir);
|
||||||
|
@ -1022,67 +976,52 @@ static int exfat_rename_file(struct inode *inode, struct exfat_chain *p_dir,
|
||||||
int oldentry, struct exfat_uni_name *p_uniname,
|
int oldentry, struct exfat_uni_name *p_uniname,
|
||||||
struct exfat_inode_info *ei)
|
struct exfat_inode_info *ei)
|
||||||
{
|
{
|
||||||
int ret, num_old_entries, num_new_entries;
|
int ret, num_new_entries;
|
||||||
struct exfat_dentry *epold, *epnew;
|
struct exfat_dentry *epold, *epnew;
|
||||||
struct super_block *sb = inode->i_sb;
|
struct super_block *sb = inode->i_sb;
|
||||||
struct buffer_head *new_bh, *old_bh;
|
struct exfat_entry_set_cache old_es, new_es;
|
||||||
int sync = IS_DIRSYNC(inode);
|
int sync = IS_DIRSYNC(inode);
|
||||||
|
|
||||||
epold = exfat_get_dentry(sb, p_dir, oldentry, &old_bh);
|
|
||||||
if (!epold)
|
|
||||||
return -EIO;
|
|
||||||
|
|
||||||
num_old_entries = exfat_count_ext_entries(sb, p_dir, oldentry, epold);
|
|
||||||
if (num_old_entries < 0)
|
|
||||||
return -EIO;
|
|
||||||
num_old_entries++;
|
|
||||||
|
|
||||||
num_new_entries = exfat_calc_num_entries(p_uniname);
|
num_new_entries = exfat_calc_num_entries(p_uniname);
|
||||||
if (num_new_entries < 0)
|
if (num_new_entries < 0)
|
||||||
return num_new_entries;
|
return num_new_entries;
|
||||||
|
|
||||||
if (num_old_entries < num_new_entries) {
|
ret = exfat_get_dentry_set(&old_es, sb, p_dir, oldentry, ES_ALL_ENTRIES);
|
||||||
|
if (ret) {
|
||||||
|
ret = -EIO;
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
epold = exfat_get_dentry_cached(&old_es, ES_IDX_FILE);
|
||||||
|
|
||||||
|
if (old_es.num_entries < num_new_entries) {
|
||||||
int newentry;
|
int newentry;
|
||||||
|
|
||||||
newentry =
|
newentry = exfat_find_empty_entry(inode, p_dir, num_new_entries,
|
||||||
exfat_find_empty_entry(inode, p_dir, num_new_entries);
|
&new_es);
|
||||||
if (newentry < 0)
|
if (newentry < 0) {
|
||||||
return newentry; /* -EIO or -ENOSPC */
|
ret = newentry; /* -EIO or -ENOSPC */
|
||||||
|
goto put_old_es;
|
||||||
epnew = exfat_get_dentry(sb, p_dir, newentry, &new_bh);
|
}
|
||||||
if (!epnew)
|
|
||||||
return -EIO;
|
|
||||||
|
|
||||||
|
epnew = exfat_get_dentry_cached(&new_es, ES_IDX_FILE);
|
||||||
*epnew = *epold;
|
*epnew = *epold;
|
||||||
if (exfat_get_entry_type(epnew) == TYPE_FILE) {
|
if (exfat_get_entry_type(epnew) == TYPE_FILE) {
|
||||||
epnew->dentry.file.attr |= cpu_to_le16(EXFAT_ATTR_ARCHIVE);
|
epnew->dentry.file.attr |= cpu_to_le16(EXFAT_ATTR_ARCHIVE);
|
||||||
ei->attr |= EXFAT_ATTR_ARCHIVE;
|
ei->attr |= EXFAT_ATTR_ARCHIVE;
|
||||||
}
|
}
|
||||||
exfat_update_bh(new_bh, sync);
|
|
||||||
brelse(old_bh);
|
|
||||||
brelse(new_bh);
|
|
||||||
|
|
||||||
epold = exfat_get_dentry(sb, p_dir, oldentry + 1, &old_bh);
|
|
||||||
if (!epold)
|
|
||||||
return -EIO;
|
|
||||||
epnew = exfat_get_dentry(sb, p_dir, newentry + 1, &new_bh);
|
|
||||||
if (!epnew) {
|
|
||||||
brelse(old_bh);
|
|
||||||
return -EIO;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
epold = exfat_get_dentry_cached(&old_es, ES_IDX_STREAM);
|
||||||
|
epnew = exfat_get_dentry_cached(&new_es, ES_IDX_STREAM);
|
||||||
*epnew = *epold;
|
*epnew = *epold;
|
||||||
exfat_update_bh(new_bh, sync);
|
|
||||||
brelse(old_bh);
|
|
||||||
brelse(new_bh);
|
|
||||||
|
|
||||||
ret = exfat_init_ext_entry(inode, p_dir, newentry,
|
exfat_init_ext_entry(&new_es, num_new_entries, p_uniname);
|
||||||
num_new_entries, p_uniname);
|
|
||||||
|
ret = exfat_put_dentry_set(&new_es, sync);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
goto put_old_es;
|
||||||
|
|
||||||
exfat_remove_entries(inode, p_dir, oldentry, 0,
|
exfat_remove_entries(inode, &old_es, ES_IDX_FILE);
|
||||||
num_old_entries);
|
|
||||||
ei->dir = *p_dir;
|
ei->dir = *p_dir;
|
||||||
ei->entry = newentry;
|
ei->entry = newentry;
|
||||||
} else {
|
} else {
|
||||||
|
@ -1090,85 +1029,72 @@ static int exfat_rename_file(struct inode *inode, struct exfat_chain *p_dir,
|
||||||
epold->dentry.file.attr |= cpu_to_le16(EXFAT_ATTR_ARCHIVE);
|
epold->dentry.file.attr |= cpu_to_le16(EXFAT_ATTR_ARCHIVE);
|
||||||
ei->attr |= EXFAT_ATTR_ARCHIVE;
|
ei->attr |= EXFAT_ATTR_ARCHIVE;
|
||||||
}
|
}
|
||||||
exfat_update_bh(old_bh, sync);
|
|
||||||
brelse(old_bh);
|
|
||||||
ret = exfat_init_ext_entry(inode, p_dir, oldentry,
|
|
||||||
num_new_entries, p_uniname);
|
|
||||||
if (ret)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
exfat_remove_entries(inode, p_dir, oldentry, num_new_entries,
|
exfat_remove_entries(inode, &old_es, ES_IDX_FIRST_FILENAME + 1);
|
||||||
num_old_entries);
|
exfat_init_ext_entry(&old_es, num_new_entries, p_uniname);
|
||||||
}
|
}
|
||||||
return 0;
|
return exfat_put_dentry_set(&old_es, sync);
|
||||||
|
|
||||||
|
put_old_es:
|
||||||
|
exfat_put_dentry_set(&old_es, false);
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int exfat_move_file(struct inode *inode, struct exfat_chain *p_olddir,
|
static int exfat_move_file(struct inode *inode, struct exfat_chain *p_olddir,
|
||||||
int oldentry, struct exfat_chain *p_newdir,
|
int oldentry, struct exfat_chain *p_newdir,
|
||||||
struct exfat_uni_name *p_uniname, struct exfat_inode_info *ei)
|
struct exfat_uni_name *p_uniname, struct exfat_inode_info *ei)
|
||||||
{
|
{
|
||||||
int ret, newentry, num_new_entries, num_old_entries;
|
int ret, newentry, num_new_entries;
|
||||||
struct exfat_dentry *epmov, *epnew;
|
struct exfat_dentry *epmov, *epnew;
|
||||||
struct super_block *sb = inode->i_sb;
|
struct super_block *sb = inode->i_sb;
|
||||||
struct buffer_head *mov_bh, *new_bh;
|
struct exfat_entry_set_cache mov_es, new_es;
|
||||||
|
|
||||||
epmov = exfat_get_dentry(sb, p_olddir, oldentry, &mov_bh);
|
|
||||||
if (!epmov)
|
|
||||||
return -EIO;
|
|
||||||
|
|
||||||
num_old_entries = exfat_count_ext_entries(sb, p_olddir, oldentry,
|
|
||||||
epmov);
|
|
||||||
if (num_old_entries < 0)
|
|
||||||
return -EIO;
|
|
||||||
num_old_entries++;
|
|
||||||
|
|
||||||
num_new_entries = exfat_calc_num_entries(p_uniname);
|
num_new_entries = exfat_calc_num_entries(p_uniname);
|
||||||
if (num_new_entries < 0)
|
if (num_new_entries < 0)
|
||||||
return num_new_entries;
|
return num_new_entries;
|
||||||
|
|
||||||
newentry = exfat_find_empty_entry(inode, p_newdir, num_new_entries);
|
ret = exfat_get_dentry_set(&mov_es, sb, p_olddir, oldentry,
|
||||||
if (newentry < 0)
|
ES_ALL_ENTRIES);
|
||||||
return newentry; /* -EIO or -ENOSPC */
|
if (ret)
|
||||||
|
|
||||||
epnew = exfat_get_dentry(sb, p_newdir, newentry, &new_bh);
|
|
||||||
if (!epnew)
|
|
||||||
return -EIO;
|
return -EIO;
|
||||||
|
|
||||||
|
newentry = exfat_find_empty_entry(inode, p_newdir, num_new_entries,
|
||||||
|
&new_es);
|
||||||
|
if (newentry < 0) {
|
||||||
|
ret = newentry; /* -EIO or -ENOSPC */
|
||||||
|
goto put_mov_es;
|
||||||
|
}
|
||||||
|
|
||||||
|
epmov = exfat_get_dentry_cached(&mov_es, ES_IDX_FILE);
|
||||||
|
epnew = exfat_get_dentry_cached(&new_es, ES_IDX_FILE);
|
||||||
*epnew = *epmov;
|
*epnew = *epmov;
|
||||||
if (exfat_get_entry_type(epnew) == TYPE_FILE) {
|
if (exfat_get_entry_type(epnew) == TYPE_FILE) {
|
||||||
epnew->dentry.file.attr |= cpu_to_le16(EXFAT_ATTR_ARCHIVE);
|
epnew->dentry.file.attr |= cpu_to_le16(EXFAT_ATTR_ARCHIVE);
|
||||||
ei->attr |= EXFAT_ATTR_ARCHIVE;
|
ei->attr |= EXFAT_ATTR_ARCHIVE;
|
||||||
}
|
}
|
||||||
exfat_update_bh(new_bh, IS_DIRSYNC(inode));
|
|
||||||
brelse(mov_bh);
|
|
||||||
brelse(new_bh);
|
|
||||||
|
|
||||||
epmov = exfat_get_dentry(sb, p_olddir, oldentry + 1, &mov_bh);
|
|
||||||
if (!epmov)
|
|
||||||
return -EIO;
|
|
||||||
epnew = exfat_get_dentry(sb, p_newdir, newentry + 1, &new_bh);
|
|
||||||
if (!epnew) {
|
|
||||||
brelse(mov_bh);
|
|
||||||
return -EIO;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
epmov = exfat_get_dentry_cached(&mov_es, ES_IDX_STREAM);
|
||||||
|
epnew = exfat_get_dentry_cached(&new_es, ES_IDX_STREAM);
|
||||||
*epnew = *epmov;
|
*epnew = *epmov;
|
||||||
exfat_update_bh(new_bh, IS_DIRSYNC(inode));
|
|
||||||
brelse(mov_bh);
|
|
||||||
brelse(new_bh);
|
|
||||||
|
|
||||||
ret = exfat_init_ext_entry(inode, p_newdir, newentry, num_new_entries,
|
exfat_init_ext_entry(&new_es, num_new_entries, p_uniname);
|
||||||
p_uniname);
|
exfat_remove_entries(inode, &mov_es, ES_IDX_FILE);
|
||||||
if (ret)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
exfat_remove_entries(inode, p_olddir, oldentry, 0, num_old_entries);
|
|
||||||
|
|
||||||
exfat_chain_set(&ei->dir, p_newdir->dir, p_newdir->size,
|
exfat_chain_set(&ei->dir, p_newdir->dir, p_newdir->size,
|
||||||
p_newdir->flags);
|
p_newdir->flags);
|
||||||
|
|
||||||
ei->entry = newentry;
|
ei->entry = newentry;
|
||||||
return 0;
|
|
||||||
|
ret = exfat_put_dentry_set(&new_es, IS_DIRSYNC(inode));
|
||||||
|
if (ret)
|
||||||
|
goto put_mov_es;
|
||||||
|
|
||||||
|
return exfat_put_dentry_set(&mov_es, IS_DIRSYNC(inode));
|
||||||
|
|
||||||
|
put_mov_es:
|
||||||
|
exfat_put_dentry_set(&mov_es, false);
|
||||||
|
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* rename or move a old file into a new file */
|
/* rename or move a old file into a new file */
|
||||||
|
@ -1186,7 +1112,6 @@ static int __exfat_rename(struct inode *old_parent_inode,
|
||||||
struct exfat_sb_info *sbi = EXFAT_SB(sb);
|
struct exfat_sb_info *sbi = EXFAT_SB(sb);
|
||||||
const unsigned char *new_path = new_dentry->d_name.name;
|
const unsigned char *new_path = new_dentry->d_name.name;
|
||||||
struct inode *new_inode = new_dentry->d_inode;
|
struct inode *new_inode = new_dentry->d_inode;
|
||||||
int num_entries;
|
|
||||||
struct exfat_inode_info *new_ei = NULL;
|
struct exfat_inode_info *new_ei = NULL;
|
||||||
unsigned int new_entry_type = TYPE_UNUSED;
|
unsigned int new_entry_type = TYPE_UNUSED;
|
||||||
int new_entry = 0;
|
int new_entry = 0;
|
||||||
|
@ -1257,25 +1182,21 @@ static int __exfat_rename(struct inode *old_parent_inode,
|
||||||
&newdir, &uni_name, ei);
|
&newdir, &uni_name, ei);
|
||||||
|
|
||||||
if (!ret && new_inode) {
|
if (!ret && new_inode) {
|
||||||
|
struct exfat_entry_set_cache es;
|
||||||
|
|
||||||
/* delete entries of new_dir */
|
/* delete entries of new_dir */
|
||||||
ep = exfat_get_dentry(sb, p_dir, new_entry, &new_bh);
|
ret = exfat_get_dentry_set(&es, sb, p_dir, new_entry,
|
||||||
if (!ep) {
|
ES_ALL_ENTRIES);
|
||||||
|
if (ret) {
|
||||||
ret = -EIO;
|
ret = -EIO;
|
||||||
goto del_out;
|
goto del_out;
|
||||||
}
|
}
|
||||||
|
|
||||||
num_entries = exfat_count_ext_entries(sb, p_dir, new_entry, ep);
|
exfat_remove_entries(new_inode, &es, ES_IDX_FILE);
|
||||||
if (num_entries < 0) {
|
|
||||||
ret = -EIO;
|
|
||||||
goto del_out;
|
|
||||||
}
|
|
||||||
brelse(new_bh);
|
|
||||||
|
|
||||||
if (exfat_remove_entries(new_inode, p_dir, new_entry, 0,
|
ret = exfat_put_dentry_set(&es, IS_DIRSYNC(new_inode));
|
||||||
num_entries + 1)) {
|
if (ret)
|
||||||
ret = -EIO;
|
|
||||||
goto del_out;
|
goto del_out;
|
||||||
}
|
|
||||||
|
|
||||||
/* Free the clusters if new_inode is a dir(as if exfat_rmdir) */
|
/* Free the clusters if new_inode is a dir(as if exfat_rmdir) */
|
||||||
if (new_entry_type == TYPE_DIR &&
|
if (new_entry_type == TYPE_DIR &&
|
||||||
|
@ -1317,6 +1238,7 @@ static int exfat_rename(struct mnt_idmap *idmap,
|
||||||
struct super_block *sb = old_dir->i_sb;
|
struct super_block *sb = old_dir->i_sb;
|
||||||
loff_t i_pos;
|
loff_t i_pos;
|
||||||
int err;
|
int err;
|
||||||
|
loff_t size = i_size_read(new_dir);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The VFS already checks for existence, so for local filesystems
|
* The VFS already checks for existence, so for local filesystems
|
||||||
|
@ -1338,7 +1260,7 @@ static int exfat_rename(struct mnt_idmap *idmap,
|
||||||
simple_rename_timestamp(old_dir, old_dentry, new_dir, new_dentry);
|
simple_rename_timestamp(old_dir, old_dentry, new_dir, new_dentry);
|
||||||
EXFAT_I(new_dir)->i_crtime = current_time(new_dir);
|
EXFAT_I(new_dir)->i_crtime = current_time(new_dir);
|
||||||
exfat_truncate_inode_atime(new_dir);
|
exfat_truncate_inode_atime(new_dir);
|
||||||
if (IS_DIRSYNC(new_dir))
|
if (IS_DIRSYNC(new_dir) && size != i_size_read(new_dir))
|
||||||
exfat_sync_inode(new_dir);
|
exfat_sync_inode(new_dir);
|
||||||
else
|
else
|
||||||
mark_inode_dirty(new_dir);
|
mark_inode_dirty(new_dir);
|
||||||
|
@ -1359,9 +1281,7 @@ static int exfat_rename(struct mnt_idmap *idmap,
|
||||||
}
|
}
|
||||||
|
|
||||||
inode_inc_iversion(old_dir);
|
inode_inc_iversion(old_dir);
|
||||||
if (IS_DIRSYNC(old_dir))
|
if (new_dir != old_dir)
|
||||||
exfat_sync_inode(old_dir);
|
|
||||||
else
|
|
||||||
mark_inode_dirty(old_dir);
|
mark_inode_dirty(old_dir);
|
||||||
|
|
||||||
if (new_inode) {
|
if (new_inode) {
|
||||||
|
|
Loading…
Reference in New Issue