Skip to content

Commit 4399598

Browse files
jankarabrauner
jankara
authored and
brauner
committed
fat: Track metadata bhs in fs-private inode part
Track metadata bhs for an inode in fs-private part of the inode. Signed-off-by: Jan Kara <jack@suse.cz> Link: https://patch.msgid.link/20260326095354.16340-79-jack@suse.cz Signed-off-by: Christian Brauner <brauner@kernel.org>
1 parent b0806ac commit 4399598

7 files changed

Lines changed: 34 additions & 20 deletions

File tree

‎fs/fat/dir.c‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,7 +1027,7 @@ static int __fat_remove_entries(struct inode *dir, loff_t pos, int nr_slots)
10271027
de++;
10281028
nr_slots--;
10291029
}
1030-
mark_buffer_dirty_inode(bh, dir);
1030+
mmb_mark_buffer_dirty(bh, &MSDOS_I(dir)->i_metadata_bhs);
10311031
if (IS_DIRSYNC(dir))
10321032
err = sync_dirty_buffer(bh);
10331033
brelse(bh);
@@ -1062,7 +1062,7 @@ int fat_remove_entries(struct inode *dir, struct fat_slot_info *sinfo)
10621062
de--;
10631063
nr_slots--;
10641064
}
1065-
mark_buffer_dirty_inode(bh, dir);
1065+
mmb_mark_buffer_dirty(bh, &MSDOS_I(dir)->i_metadata_bhs);
10661066
if (IS_DIRSYNC(dir))
10671067
err = sync_dirty_buffer(bh);
10681068
brelse(bh);
@@ -1114,7 +1114,7 @@ static int fat_zeroed_cluster(struct inode *dir, sector_t blknr, int nr_used,
11141114
memset(bhs[n]->b_data, 0, sb->s_blocksize);
11151115
set_buffer_uptodate(bhs[n]);
11161116
unlock_buffer(bhs[n]);
1117-
mark_buffer_dirty_inode(bhs[n], dir);
1117+
mmb_mark_buffer_dirty(bhs[n], &MSDOS_I(dir)->i_metadata_bhs);
11181118

11191119
n++;
11201120
blknr++;
@@ -1195,7 +1195,7 @@ int fat_alloc_new_dir(struct inode *dir, struct timespec64 *ts)
11951195
memset(de + 2, 0, sb->s_blocksize - 2 * sizeof(*de));
11961196
set_buffer_uptodate(bhs[0]);
11971197
unlock_buffer(bhs[0]);
1198-
mark_buffer_dirty_inode(bhs[0], dir);
1198+
mmb_mark_buffer_dirty(bhs[0], &MSDOS_I(dir)->i_metadata_bhs);
11991199

12001200
err = fat_zeroed_cluster(dir, blknr, 1, bhs, MAX_BUF_PER_PAGE);
12011201
if (err)
@@ -1257,7 +1257,8 @@ static int fat_add_new_entries(struct inode *dir, void *slots, int nr_slots,
12571257
memcpy(bhs[n]->b_data, slots, copy);
12581258
set_buffer_uptodate(bhs[n]);
12591259
unlock_buffer(bhs[n]);
1260-
mark_buffer_dirty_inode(bhs[n], dir);
1260+
mmb_mark_buffer_dirty(bhs[n],
1261+
&MSDOS_I(dir)->i_metadata_bhs);
12611262
slots += copy;
12621263
size -= copy;
12631264
if (!size)
@@ -1358,7 +1359,8 @@ int fat_add_entries(struct inode *dir, void *slots, int nr_slots,
13581359
for (i = 0; i < long_bhs; i++) {
13591360
int copy = umin(sb->s_blocksize - offset, size);
13601361
memcpy(bhs[i]->b_data + offset, slots, copy);
1361-
mark_buffer_dirty_inode(bhs[i], dir);
1362+
mmb_mark_buffer_dirty(bhs[i],
1363+
&MSDOS_I(dir)->i_metadata_bhs);
13621364
offset = 0;
13631365
slots += copy;
13641366
size -= copy;
@@ -1369,7 +1371,8 @@ int fat_add_entries(struct inode *dir, void *slots, int nr_slots,
13691371
/* Fill the short name slot. */
13701372
int copy = umin(sb->s_blocksize - offset, size);
13711373
memcpy(bhs[i]->b_data + offset, slots, copy);
1372-
mark_buffer_dirty_inode(bhs[i], dir);
1374+
mmb_mark_buffer_dirty(bhs[i],
1375+
&MSDOS_I(dir)->i_metadata_bhs);
13731376
if (IS_DIRSYNC(dir))
13741377
err = sync_dirty_buffer(bhs[i]);
13751378
}

‎fs/fat/fat.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ struct msdos_inode_info {
130130
struct hlist_node i_dir_hash; /* hash by i_logstart */
131131
struct rw_semaphore truncate_lock; /* protect bmap against truncate */
132132
struct timespec64 i_crtime; /* File creation (birth) time */
133+
struct mapping_metadata_bhs i_metadata_bhs;
133134
struct inode vfs_inode;
134135
};
135136

‎fs/fat/fatent.c‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,11 @@ static void fat12_ent_put(struct fat_entry *fatent, int new)
170170
}
171171
spin_unlock(&fat12_entry_lock);
172172

173-
mark_buffer_dirty_inode(fatent->bhs[0], fatent->fat_inode);
173+
mmb_mark_buffer_dirty(fatent->bhs[0],
174+
&MSDOS_I(fatent->fat_inode)->i_metadata_bhs);
174175
if (fatent->nr_bhs == 2)
175-
mark_buffer_dirty_inode(fatent->bhs[1], fatent->fat_inode);
176+
mmb_mark_buffer_dirty(fatent->bhs[1],
177+
&MSDOS_I(fatent->fat_inode)->i_metadata_bhs);
176178
}
177179

178180
static void fat16_ent_put(struct fat_entry *fatent, int new)
@@ -181,15 +183,17 @@ static void fat16_ent_put(struct fat_entry *fatent, int new)
181183
new = EOF_FAT16;
182184

183185
*fatent->u.ent16_p = cpu_to_le16(new);
184-
mark_buffer_dirty_inode(fatent->bhs[0], fatent->fat_inode);
186+
mmb_mark_buffer_dirty(fatent->bhs[0],
187+
&MSDOS_I(fatent->fat_inode)->i_metadata_bhs);
185188
}
186189

187190
static void fat32_ent_put(struct fat_entry *fatent, int new)
188191
{
189192
WARN_ON(new & 0xf0000000);
190193
new |= le32_to_cpu(*fatent->u.ent32_p) & ~0x0fffffff;
191194
*fatent->u.ent32_p = cpu_to_le32(new);
192-
mark_buffer_dirty_inode(fatent->bhs[0], fatent->fat_inode);
195+
mmb_mark_buffer_dirty(fatent->bhs[0],
196+
&MSDOS_I(fatent->fat_inode)->i_metadata_bhs);
193197
}
194198

195199
static int fat12_ent_next(struct fat_entry *fatent)
@@ -395,7 +399,8 @@ static int fat_mirror_bhs(struct super_block *sb, struct buffer_head **bhs,
395399
memcpy(c_bh->b_data, bhs[n]->b_data, sb->s_blocksize);
396400
set_buffer_uptodate(c_bh);
397401
unlock_buffer(c_bh);
398-
mark_buffer_dirty_inode(c_bh, sbi->fat_inode);
402+
mmb_mark_buffer_dirty(c_bh,
403+
&MSDOS_I(sbi->fat_inode)->i_metadata_bhs);
399404
if (sb->s_flags & SB_SYNCHRONOUS)
400405
err = sync_dirty_buffer(c_bh);
401406
brelse(c_bh);

‎fs/fat/file.c‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,13 +186,15 @@ static int fat_file_release(struct inode *inode, struct file *filp)
186186
int fat_file_fsync(struct file *filp, loff_t start, loff_t end, int datasync)
187187
{
188188
struct inode *inode = filp->f_mapping->host;
189+
struct inode *fat_inode = MSDOS_SB(inode->i_sb)->fat_inode;
189190
int err;
190191

191-
err = generic_buffers_fsync_noflush(filp, start, end, datasync);
192+
err = mmb_fsync_noflush(filp, &MSDOS_I(inode)->i_metadata_bhs,
193+
start, end, datasync);
192194
if (err)
193195
return err;
194196

195-
err = sync_mapping_buffers(MSDOS_SB(inode->i_sb)->fat_inode->i_mapping);
197+
err = mmb_sync(&MSDOS_I(fat_inode)->i_metadata_bhs);
196198
if (err)
197199
return err;
198200

@@ -236,7 +238,7 @@ static int fat_cont_expand(struct inode *inode, loff_t size)
236238
*/
237239
err = filemap_fdatawrite_range(mapping, start,
238240
start + count - 1);
239-
err2 = sync_mapping_buffers(mapping);
241+
err2 = mmb_sync(&MSDOS_I(inode)->i_metadata_bhs);
240242
if (!err)
241243
err = err2;
242244
err2 = write_inode_now(inode, 1);

‎fs/fat/inode.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -658,11 +658,11 @@ static void fat_evict_inode(struct inode *inode)
658658
inode->i_size = 0;
659659
fat_truncate_blocks(inode, 0);
660660
} else {
661-
sync_mapping_buffers(inode->i_mapping);
661+
mmb_sync(&MSDOS_I(inode)->i_metadata_bhs);
662662
fat_free_eofblocks(inode);
663663
}
664664

665-
invalidate_inode_buffers(inode);
665+
mmb_invalidate(&MSDOS_I(inode)->i_metadata_bhs);
666666
clear_inode(inode);
667667
fat_cache_inval_inode(inode);
668668
fat_detach(inode);
@@ -763,6 +763,7 @@ static struct inode *fat_alloc_inode(struct super_block *sb)
763763
ei->i_pos = 0;
764764
ei->i_crtime.tv_sec = 0;
765765
ei->i_crtime.tv_nsec = 0;
766+
mmb_init(&ei->i_metadata_bhs, &ei->vfs_inode.i_data);
766767

767768
return &ei->vfs_inode;
768769
}

‎fs/fat/namei_msdos.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,8 @@ static int do_msdos_rename(struct inode *old_dir, unsigned char *old_name,
527527

528528
if (update_dotdot) {
529529
fat_set_start(dotdot_de, MSDOS_I(new_dir)->i_logstart);
530-
mark_buffer_dirty_inode(dotdot_bh, old_inode);
530+
mmb_mark_buffer_dirty(dotdot_bh,
531+
&MSDOS_I(old_inode)->i_metadata_bhs);
531532
if (IS_DIRSYNC(new_dir)) {
532533
err = sync_dirty_buffer(dotdot_bh);
533534
if (err)
@@ -566,7 +567,8 @@ static int do_msdos_rename(struct inode *old_dir, unsigned char *old_name,
566567

567568
if (update_dotdot) {
568569
fat_set_start(dotdot_de, MSDOS_I(old_dir)->i_logstart);
569-
mark_buffer_dirty_inode(dotdot_bh, old_inode);
570+
mmb_mark_buffer_dirty(dotdot_bh,
571+
&MSDOS_I(old_inode)->i_metadata_bhs);
570572
corrupt |= sync_dirty_buffer(dotdot_bh);
571573
}
572574
error_inode:

‎fs/fat/namei_vfat.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -915,7 +915,7 @@ static int vfat_update_dotdot_de(struct inode *dir, struct inode *inode,
915915
struct msdos_dir_entry *dotdot_de)
916916
{
917917
fat_set_start(dotdot_de, MSDOS_I(dir)->i_logstart);
918-
mark_buffer_dirty_inode(dotdot_bh, inode);
918+
mmb_mark_buffer_dirty(dotdot_bh, &MSDOS_I(inode)->i_metadata_bhs);
919919
if (IS_DIRSYNC(dir))
920920
return sync_dirty_buffer(dotdot_bh);
921921
return 0;

0 commit comments

Comments
 (0)