From: Jan Kara <jack@suse.cz>
To: <linux-fsdevel@vger.kernel.org>
Cc: <linux-block@vger.kernel.org>,
Christian Brauner <brauner@kernel.org>,
Al Viro <viro@ZenIV.linux.org.uk>, <linux-ext4@vger.kernel.org>,
Ted Tso <tytso@mit.edu>,
"Tigran A. Aivazian" <aivazian.tigran@gmail.com>,
David Sterba <dsterba@suse.com>,
OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>,
Muchun Song <muchun.song@linux.dev>,
Oscar Salvador <osalvador@suse.de>,
David Hildenbrand <david@kernel.org>,
linux-mm@kvack.org, linux-aio@kvack.org,
Benjamin LaHaise <bcrl@kvack.org>, Jan Kara <jack@suse.cz>
Subject: [PATCH 35/41] fat: Track metadata bhs in fs-private inode part
Date: Fri, 20 Mar 2026 14:41:30 +0100 [thread overview]
Message-ID: <20260320134100.20731-76-jack@suse.cz> (raw)
In-Reply-To: <20260320131728.6449-1-jack@suse.cz>
Track metadata bhs for an inode in fs-private part of the inode.
Signed-off-by: Jan Kara <jack@suse.cz>
---
fs/fat/dir.c | 17 ++++++++++-------
fs/fat/fat.h | 1 +
fs/fat/fatent.c | 15 ++++++++++-----
fs/fat/file.c | 8 +++++---
fs/fat/inode.c | 5 +++--
fs/fat/namei_msdos.c | 6 ++++--
fs/fat/namei_vfat.c | 2 +-
7 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/fs/fat/dir.c b/fs/fat/dir.c
index 4b8b25f688e4..4f6f42f33613 100644
--- a/fs/fat/dir.c
+++ b/fs/fat/dir.c
@@ -1027,7 +1027,7 @@ static int __fat_remove_entries(struct inode *dir, loff_t pos, int nr_slots)
de++;
nr_slots--;
}
- mark_buffer_dirty_inode(bh, dir);
+ mmb_mark_buffer_dirty(bh, &MSDOS_I(dir)->i_metadata_bhs);
if (IS_DIRSYNC(dir))
err = sync_dirty_buffer(bh);
brelse(bh);
@@ -1062,7 +1062,7 @@ int fat_remove_entries(struct inode *dir, struct fat_slot_info *sinfo)
de--;
nr_slots--;
}
- mark_buffer_dirty_inode(bh, dir);
+ mmb_mark_buffer_dirty(bh, &MSDOS_I(dir)->i_metadata_bhs);
if (IS_DIRSYNC(dir))
err = sync_dirty_buffer(bh);
brelse(bh);
@@ -1114,7 +1114,7 @@ static int fat_zeroed_cluster(struct inode *dir, sector_t blknr, int nr_used,
memset(bhs[n]->b_data, 0, sb->s_blocksize);
set_buffer_uptodate(bhs[n]);
unlock_buffer(bhs[n]);
- mark_buffer_dirty_inode(bhs[n], dir);
+ mmb_mark_buffer_dirty(bhs[n], &MSDOS_I(dir)->i_metadata_bhs);
n++;
blknr++;
@@ -1195,7 +1195,7 @@ int fat_alloc_new_dir(struct inode *dir, struct timespec64 *ts)
memset(de + 2, 0, sb->s_blocksize - 2 * sizeof(*de));
set_buffer_uptodate(bhs[0]);
unlock_buffer(bhs[0]);
- mark_buffer_dirty_inode(bhs[0], dir);
+ mmb_mark_buffer_dirty(bhs[0], &MSDOS_I(dir)->i_metadata_bhs);
err = fat_zeroed_cluster(dir, blknr, 1, bhs, MAX_BUF_PER_PAGE);
if (err)
@@ -1257,7 +1257,8 @@ static int fat_add_new_entries(struct inode *dir, void *slots, int nr_slots,
memcpy(bhs[n]->b_data, slots, copy);
set_buffer_uptodate(bhs[n]);
unlock_buffer(bhs[n]);
- mark_buffer_dirty_inode(bhs[n], dir);
+ mmb_mark_buffer_dirty(bhs[n],
+ &MSDOS_I(dir)->i_metadata_bhs);
slots += copy;
size -= copy;
if (!size)
@@ -1358,7 +1359,8 @@ int fat_add_entries(struct inode *dir, void *slots, int nr_slots,
for (i = 0; i < long_bhs; i++) {
int copy = umin(sb->s_blocksize - offset, size);
memcpy(bhs[i]->b_data + offset, slots, copy);
- mark_buffer_dirty_inode(bhs[i], dir);
+ mmb_mark_buffer_dirty(bhs[i],
+ &MSDOS_I(dir)->i_metadata_bhs);
offset = 0;
slots += copy;
size -= copy;
@@ -1369,7 +1371,8 @@ int fat_add_entries(struct inode *dir, void *slots, int nr_slots,
/* Fill the short name slot. */
int copy = umin(sb->s_blocksize - offset, size);
memcpy(bhs[i]->b_data + offset, slots, copy);
- mark_buffer_dirty_inode(bhs[i], dir);
+ mmb_mark_buffer_dirty(bhs[i],
+ &MSDOS_I(dir)->i_metadata_bhs);
if (IS_DIRSYNC(dir))
err = sync_dirty_buffer(bhs[i]);
}
diff --git a/fs/fat/fat.h b/fs/fat/fat.h
index 0d269dba897b..5a58f0bf8ce8 100644
--- a/fs/fat/fat.h
+++ b/fs/fat/fat.h
@@ -130,6 +130,7 @@ struct msdos_inode_info {
struct hlist_node i_dir_hash; /* hash by i_logstart */
struct rw_semaphore truncate_lock; /* protect bmap against truncate */
struct timespec64 i_crtime; /* File creation (birth) time */
+ struct mapping_metadata_bhs i_metadata_bhs;
struct inode vfs_inode;
};
diff --git a/fs/fat/fatent.c b/fs/fat/fatent.c
index a7061c2ad8e4..f0801d99dd62 100644
--- a/fs/fat/fatent.c
+++ b/fs/fat/fatent.c
@@ -170,9 +170,11 @@ static void fat12_ent_put(struct fat_entry *fatent, int new)
}
spin_unlock(&fat12_entry_lock);
- mark_buffer_dirty_inode(fatent->bhs[0], fatent->fat_inode);
+ mmb_mark_buffer_dirty(fatent->bhs[0],
+ &MSDOS_I(fatent->fat_inode)->i_metadata_bhs);
if (fatent->nr_bhs == 2)
- mark_buffer_dirty_inode(fatent->bhs[1], fatent->fat_inode);
+ mmb_mark_buffer_dirty(fatent->bhs[1],
+ &MSDOS_I(fatent->fat_inode)->i_metadata_bhs);
}
static void fat16_ent_put(struct fat_entry *fatent, int new)
@@ -181,7 +183,8 @@ static void fat16_ent_put(struct fat_entry *fatent, int new)
new = EOF_FAT16;
*fatent->u.ent16_p = cpu_to_le16(new);
- mark_buffer_dirty_inode(fatent->bhs[0], fatent->fat_inode);
+ mmb_mark_buffer_dirty(fatent->bhs[0],
+ &MSDOS_I(fatent->fat_inode)->i_metadata_bhs);
}
static void fat32_ent_put(struct fat_entry *fatent, int new)
@@ -189,7 +192,8 @@ static void fat32_ent_put(struct fat_entry *fatent, int new)
WARN_ON(new & 0xf0000000);
new |= le32_to_cpu(*fatent->u.ent32_p) & ~0x0fffffff;
*fatent->u.ent32_p = cpu_to_le32(new);
- mark_buffer_dirty_inode(fatent->bhs[0], fatent->fat_inode);
+ mmb_mark_buffer_dirty(fatent->bhs[0],
+ &MSDOS_I(fatent->fat_inode)->i_metadata_bhs);
}
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,
memcpy(c_bh->b_data, bhs[n]->b_data, sb->s_blocksize);
set_buffer_uptodate(c_bh);
unlock_buffer(c_bh);
- mark_buffer_dirty_inode(c_bh, sbi->fat_inode);
+ mmb_mark_buffer_dirty(c_bh,
+ &MSDOS_I(sbi->fat_inode)->i_metadata_bhs);
if (sb->s_flags & SB_SYNCHRONOUS)
err = sync_dirty_buffer(c_bh);
brelse(c_bh);
diff --git a/fs/fat/file.c b/fs/fat/file.c
index 1551065a7964..3bac06b41420 100644
--- a/fs/fat/file.c
+++ b/fs/fat/file.c
@@ -186,13 +186,15 @@ static int fat_file_release(struct inode *inode, struct file *filp)
int fat_file_fsync(struct file *filp, loff_t start, loff_t end, int datasync)
{
struct inode *inode = filp->f_mapping->host;
+ struct inode *fat_inode = MSDOS_SB(inode->i_sb)->fat_inode;
int err;
- err = generic_buffers_fsync_noflush(filp, start, end, datasync);
+ err = generic_mmb_fsync_noflush(filp, &MSDOS_I(inode)->i_metadata_bhs,
+ start, end, datasync);
if (err)
return err;
- err = sync_mapping_buffers(MSDOS_SB(inode->i_sb)->fat_inode->i_mapping);
+ err = mmb_sync_buffers(&MSDOS_I(fat_inode)->i_metadata_bhs);
if (err)
return err;
@@ -236,7 +238,7 @@ static int fat_cont_expand(struct inode *inode, loff_t size)
*/
err = filemap_fdatawrite_range(mapping, start,
start + count - 1);
- err2 = sync_mapping_buffers(mapping);
+ err2 = mmb_sync_buffers(&MSDOS_I(inode)->i_metadata_bhs);
if (!err)
err = err2;
err2 = write_inode_now(inode, 1);
diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index ce88602b0d57..1e54091c80fc 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -658,11 +658,11 @@ static void fat_evict_inode(struct inode *inode)
inode->i_size = 0;
fat_truncate_blocks(inode, 0);
} else {
- sync_mapping_buffers(inode->i_mapping);
+ mmb_sync_buffers(&MSDOS_I(inode)->i_metadata_bhs);
fat_free_eofblocks(inode);
}
- invalidate_inode_buffers(inode);
+ mmb_invalidate_buffers(&MSDOS_I(inode)->i_metadata_bhs);
clear_inode(inode);
fat_cache_inval_inode(inode);
fat_detach(inode);
@@ -763,6 +763,7 @@ static struct inode *fat_alloc_inode(struct super_block *sb)
ei->i_pos = 0;
ei->i_crtime.tv_sec = 0;
ei->i_crtime.tv_nsec = 0;
+ mmb_init(&ei->i_metadata_bhs, &ei->vfs_inode.i_data);
return &ei->vfs_inode;
}
diff --git a/fs/fat/namei_msdos.c b/fs/fat/namei_msdos.c
index 048c103b506a..4cc65f330fb7 100644
--- a/fs/fat/namei_msdos.c
+++ b/fs/fat/namei_msdos.c
@@ -527,7 +527,8 @@ static int do_msdos_rename(struct inode *old_dir, unsigned char *old_name,
if (update_dotdot) {
fat_set_start(dotdot_de, MSDOS_I(new_dir)->i_logstart);
- mark_buffer_dirty_inode(dotdot_bh, old_inode);
+ mmb_mark_buffer_dirty(dotdot_bh,
+ &MSDOS_I(old_inode)->i_metadata_bhs);
if (IS_DIRSYNC(new_dir)) {
err = sync_dirty_buffer(dotdot_bh);
if (err)
@@ -566,7 +567,8 @@ static int do_msdos_rename(struct inode *old_dir, unsigned char *old_name,
if (update_dotdot) {
fat_set_start(dotdot_de, MSDOS_I(old_dir)->i_logstart);
- mark_buffer_dirty_inode(dotdot_bh, old_inode);
+ mmb_mark_buffer_dirty(dotdot_bh,
+ &MSDOS_I(old_inode)->i_metadata_bhs);
corrupt |= sync_dirty_buffer(dotdot_bh);
}
error_inode:
diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c
index 87dcdd86272b..918b3756674c 100644
--- a/fs/fat/namei_vfat.c
+++ b/fs/fat/namei_vfat.c
@@ -915,7 +915,7 @@ static int vfat_update_dotdot_de(struct inode *dir, struct inode *inode,
struct msdos_dir_entry *dotdot_de)
{
fat_set_start(dotdot_de, MSDOS_I(dir)->i_logstart);
- mark_buffer_dirty_inode(dotdot_bh, inode);
+ mmb_mark_buffer_dirty(dotdot_bh, &MSDOS_I(inode)->i_metadata_bhs);
if (IS_DIRSYNC(dir))
return sync_dirty_buffer(dotdot_bh);
return 0;
--
2.51.0
next prev parent reply other threads:[~2026-03-20 13:43 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-20 13:40 [PATCH v2 0/41] fs: Move metadata bh tracking from address_space Jan Kara
2026-03-20 13:40 ` [PATCH 01/41] ext4: Use inode_has_buffers() Jan Kara
2026-03-20 13:40 ` [PATCH 02/41] gfs2: Don't zero i_private_data Jan Kara
2026-03-20 13:40 ` [PATCH 03/41] ntfs3: Drop pointless sync_mapping_buffers() and invalidate_inode_buffers() calls Jan Kara
2026-03-20 13:40 ` [PATCH 04/41] ocfs2: Drop pointless sync_mapping_buffers() calls Jan Kara
2026-03-23 10:46 ` Joseph Qi
2026-03-20 13:41 ` [PATCH 05/41] bdev: Drop pointless invalidate_inode_buffers() call Jan Kara
2026-03-20 13:41 ` [PATCH 06/41] ufs: Drop pointless invalidate_mapping_buffers() call Jan Kara
2026-03-20 13:41 ` [PATCH 07/41] exfat: Drop pointless invalidate_inode_buffers() call Jan Kara
2026-03-20 13:41 ` [PATCH 08/41] udf: Switch to generic_buffers_fsync() Jan Kara
2026-03-24 5:38 ` Christoph Hellwig
2026-03-24 12:24 ` Jan Kara
2026-03-20 13:41 ` [PATCH 09/41] minix: " Jan Kara
2026-03-20 13:41 ` [PATCH 10/41] bfs: " Jan Kara
2026-03-20 13:41 ` [PATCH 11/41] fat: Switch to generic_buffers_fsync_noflush() Jan Kara
2026-03-20 13:41 ` [PATCH 12/41] fs: Drop sync_mapping_buffers() from __generic_file_fsync() Jan Kara
2026-03-24 5:40 ` Christoph Hellwig
2026-03-24 12:34 ` Jan Kara
2026-03-24 13:17 ` Christoph Hellwig
2026-03-24 13:36 ` Jan Kara
2026-03-24 15:54 ` Christoph Hellwig
2026-03-25 19:01 ` Jan Kara
2026-03-20 13:41 ` [PATCH 13/41] fat: Sync and invalidate metadata buffers from fat_evict_inode() Jan Kara
2026-03-20 13:41 ` [PATCH 14/41] udf: Sync and invalidate metadata buffers from udf_evict_inode() Jan Kara
2026-03-20 13:41 ` [PATCH 15/41] minix: Sync and invalidate metadata buffers from minix_evict_inode() Jan Kara
2026-03-20 13:41 ` [PATCH 16/41] ext2: Sync and invalidate metadata buffers from ext2_evict_inode() Jan Kara
2026-03-20 13:41 ` [PATCH 17/41] ext4: Sync and invalidate metadata buffers from ext4_evict_inode() Jan Kara
2026-03-20 13:41 ` [PATCH 18/41] bfs: Sync and invalidate metadata buffers from bfs_evict_inode() Jan Kara
2026-03-20 13:41 ` [PATCH 19/41] affs: Sync and invalidate metadata buffers from affs_evict_inode() Jan Kara
2026-03-20 13:41 ` [PATCH 20/41] fs: Ignore inode metadata buffers in inode_lru_isolate() Jan Kara
2026-03-24 5:42 ` Christoph Hellwig
2026-03-24 12:51 ` Jan Kara
2026-03-20 13:41 ` [PATCH 21/41] fs: Stop using i_private_data for metadata bh tracking Jan Kara
2026-03-24 5:42 ` Christoph Hellwig
2026-03-20 13:41 ` [PATCH 22/41] hugetlbfs: Stop using i_private_data Jan Kara
2026-03-24 5:42 ` Christoph Hellwig
2026-03-20 13:41 ` [PATCH 23/41] aio: Stop using i_private_data and i_private_lock Jan Kara
2026-03-24 5:43 ` Christoph Hellwig
2026-03-20 13:41 ` [PATCH 24/41] fs: Remove i_private_data Jan Kara
2026-03-24 5:43 ` Christoph Hellwig
2026-03-20 13:41 ` [PATCH 25/41] kvm: Use private inode list instead of i_private_list Jan Kara
2026-03-24 5:44 ` Christoph Hellwig
2026-03-20 13:41 ` [PATCH 26/41] fs: Drop osync_buffers_list() Jan Kara
2026-03-24 5:44 ` Christoph Hellwig
2026-03-20 13:41 ` [PATCH 27/41] fs: Fold fsync_buffers_list() into sync_mapping_buffers() Jan Kara
2026-03-24 5:44 ` Christoph Hellwig
2026-03-20 13:41 ` [PATCH 28/41] fs: Move metadata bhs tracking to a separate struct Jan Kara
2026-03-24 5:47 ` Christoph Hellwig
2026-03-20 13:41 ` [PATCH 29/41] fs: Make bhs point to mapping_metadata_bhs Jan Kara
2026-03-24 5:48 ` Christoph Hellwig
2026-03-20 13:41 ` [PATCH 30/41] fs: Switch inode_has_buffers() to take mapping_metadata_bhs Jan Kara
2026-03-24 5:48 ` Christoph Hellwig
2026-03-20 13:41 ` [PATCH 31/41] fs: Provide functions for handling mapping_metadata_bhs directly Jan Kara
2026-03-24 5:51 ` Christoph Hellwig
2026-03-25 19:00 ` Jan Kara
2026-03-20 13:41 ` [PATCH 32/41] ext2: Track metadata bhs in fs-private inode part Jan Kara
2026-03-20 13:41 ` [PATCH 33/41] affs: " Jan Kara
2026-03-20 13:41 ` [PATCH 34/41] bfs: " Jan Kara
2026-03-20 13:41 ` Jan Kara [this message]
2026-03-20 13:41 ` [PATCH 36/41] udf: " Jan Kara
2026-03-20 13:41 ` [PATCH 37/41] minix: " Jan Kara
2026-03-20 13:41 ` [PATCH 38/41] ext4: " Jan Kara
2026-03-20 13:41 ` [PATCH 39/41] fs: Drop mapping_metadata_bhs from address space Jan Kara
2026-03-20 13:41 ` [PATCH 40/41] fs: Drop i_private_list from address_space Jan Kara
2026-03-20 13:41 ` [PATCH 41/41] fs: Unify generic_file_fsync() with mmb methods Jan Kara
2026-03-24 5:56 ` Christoph Hellwig
2026-03-24 13:28 ` Jan Kara
2026-03-23 10:20 ` [PATCH v2 0/41] fs: Move metadata bh tracking from address_space Christian Brauner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260320134100.20731-76-jack@suse.cz \
--to=jack@suse.cz \
--cc=aivazian.tigran@gmail.com \
--cc=bcrl@kvack.org \
--cc=brauner@kernel.org \
--cc=david@kernel.org \
--cc=dsterba@suse.com \
--cc=hirofumi@mail.parknet.co.jp \
--cc=linux-aio@kvack.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=muchun.song@linux.dev \
--cc=osalvador@suse.de \
--cc=tytso@mit.edu \
--cc=viro@ZenIV.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.