affs: 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-77-jack@suse.cz
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/affs/affs.h b/fs/affs/affs.h
index ac4e9a02910b72d63c8ec5291347b54518e67f4b..a1eb400e1018aa086ffbedfe71911e58035b25af 100644 (file)
--- a/fs/affs/affs.h
+++ b/fs/affs/affs.h
@@ -44,6 +44,7 @@ struct affs_inode_info {
        struct mutex i_link_lock;               /* Protects internal inode access. */
        struct mutex i_ext_lock;                /* Protects internal inode access. */
 #define i_hash_lock i_ext_lock
+       struct mapping_metadata_bhs i_metadata_bhs;
        u32      i_blkcnt;                      /* block count */
        u32      i_extcnt;                      /* extended block count */
        u32     *i_lc;                          /* linear cache of extended blocks */
@@ -151,6 +152,7 @@ extern bool affs_nofilenametruncate(const struct dentry *dentry);
 extern int     affs_check_name(const unsigned char *name, int len,
                                bool notruncate);
 extern int     affs_copy_name(unsigned char *bstr, struct dentry *dentry);
+struct mapping_metadata_bhs *affs_get_metadata_bhs(struct inode *inode);
 
 /* bitmap. c */
 

diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c
index fd669daa4e7bc951d8d7959c7a5ab1b60b75c61a..13a914c1d8b7e42dfa5c45431bc15ae308715431 100644 (file)
--- a/fs/affs/amigaffs.c
+++ b/fs/affs/amigaffs.c
@@ -57,7 +57,7 @@ affs_insert_hash(struct inode *dir, struct buffer_head *bh)
                AFFS_TAIL(sb, dir_bh)->hash_chain = cpu_to_be32(ino);
 
        affs_adjust_checksum(dir_bh, ino);
-       mark_buffer_dirty_inode(dir_bh, dir);
+       mmb_mark_buffer_dirty(dir_bh, &AFFS_I(dir)->i_metadata_bhs);
        affs_brelse(dir_bh);
 
        inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
@@ -100,7 +100,7 @@ affs_remove_hash(struct inode *dir, struct buffer_head *rem_bh)
                        else
                                AFFS_TAIL(sb, bh)->hash_chain = ino;
                        affs_adjust_checksum(bh, be32_to_cpu(ino) - hash_ino);
-                       mark_buffer_dirty_inode(bh, dir);
+                       mmb_mark_buffer_dirty(bh, &AFFS_I(dir)->i_metadata_bhs);
                        AFFS_TAIL(sb, rem_bh)->parent = 0;
                        retval = 0;
                        break;
@@ -180,7 +180,7 @@ affs_remove_link(struct dentry *dentry)
                        affs_unlock_dir(dir);
                        goto done;
                }
-               mark_buffer_dirty_inode(link_bh, inode);
+               mmb_mark_buffer_dirty(link_bh, &AFFS_I(inode)->i_metadata_bhs);
 
                memcpy(AFFS_TAIL(sb, bh)->name, AFFS_TAIL(sb, link_bh)->name, 32);
                retval = affs_insert_hash(dir, bh);
@@ -188,7 +188,7 @@ affs_remove_link(struct dentry *dentry)
                        affs_unlock_dir(dir);
                        goto done;
                }
-               mark_buffer_dirty_inode(bh, inode);
+               mmb_mark_buffer_dirty(bh, &AFFS_I(inode)->i_metadata_bhs);
 
                affs_unlock_dir(dir);
                iput(dir);
@@ -203,7 +203,7 @@ affs_remove_link(struct dentry *dentry)
                        __be32 ino2 = AFFS_TAIL(sb, link_bh)->link_chain;
                        AFFS_TAIL(sb, bh)->link_chain = ino2;
                        affs_adjust_checksum(bh, be32_to_cpu(ino2) - link_ino);
-                       mark_buffer_dirty_inode(bh, inode);
+                       mmb_mark_buffer_dirty(bh, &AFFS_I(inode)->i_metadata_bhs);
                        retval = 0;
                        /* Fix the link count, if bh is a normal header block without links */
                        switch (be32_to_cpu(AFFS_TAIL(sb, bh)->stype)) {
@@ -306,7 +306,7 @@ affs_remove_header(struct dentry *dentry)
        retval = affs_remove_hash(dir, bh);
        if (retval)
                goto done_unlock;
-       mark_buffer_dirty_inode(bh, inode);
+       mmb_mark_buffer_dirty(bh, &AFFS_I(inode)->i_metadata_bhs);
 
        affs_unlock_dir(dir);
 

diff --git a/fs/affs/file.c b/fs/affs/file.c
index 6c9258359ddb9ba344976dd5a9a435f71f3fabc1..606630d6f5f7dada5c9087fae7a2996ee87c2bcf 100644 (file)
--- a/fs/affs/file.c
+++ b/fs/affs/file.c
@@ -140,14 +140,14 @@ affs_alloc_extblock(struct inode *inode, struct buffer_head *bh, u32 ext)
        AFFS_TAIL(sb, new_bh)->parent = cpu_to_be32(inode->i_ino);
        affs_fix_checksum(sb, new_bh);
 
-       mark_buffer_dirty_inode(new_bh, inode);
+       mmb_mark_buffer_dirty(new_bh, &AFFS_I(inode)->i_metadata_bhs);
 
        tmp = be32_to_cpu(AFFS_TAIL(sb, bh)->extension);
        if (tmp)
                affs_warning(sb, "alloc_ext", "previous extension set (%x)", tmp);
        AFFS_TAIL(sb, bh)->extension = cpu_to_be32(blocknr);
        affs_adjust_checksum(bh, blocknr - tmp);
-       mark_buffer_dirty_inode(bh, inode);
+       mmb_mark_buffer_dirty(bh, &AFFS_I(inode)->i_metadata_bhs);
 
        AFFS_I(inode)->i_extcnt++;
        mark_inode_dirty(inode);
@@ -581,7 +581,7 @@ affs_extent_file_ofs(struct inode *inode, u32 newsize)
                memset(AFFS_DATA(bh) + boff, 0, tmp);
                be32_add_cpu(&AFFS_DATA_HEAD(bh)->size, tmp);
                affs_fix_checksum(sb, bh);
-               mark_buffer_dirty_inode(bh, inode);
+               mmb_mark_buffer_dirty(bh, &AFFS_I(inode)->i_metadata_bhs);
                size += tmp;
                bidx++;
        } else if (bidx) {
@@ -603,7 +603,7 @@ affs_extent_file_ofs(struct inode *inode, u32 newsize)
                AFFS_DATA_HEAD(bh)->size = cpu_to_be32(tmp);
                affs_fix_checksum(sb, bh);
                bh->b_state &= ~(1UL << BH_New);
-               mark_buffer_dirty_inode(bh, inode);
+               mmb_mark_buffer_dirty(bh, &AFFS_I(inode)->i_metadata_bhs);
                if (prev_bh) {
                        u32 tmp_next = be32_to_cpu(AFFS_DATA_HEAD(prev_bh)->next);
 
@@ -613,7 +613,8 @@ affs_extent_file_ofs(struct inode *inode, u32 newsize)
                                             bidx, tmp_next);
                        AFFS_DATA_HEAD(prev_bh)->next = cpu_to_be32(bh->b_blocknr);
                        affs_adjust_checksum(prev_bh, bh->b_blocknr - tmp_next);
-                       mark_buffer_dirty_inode(prev_bh, inode);
+                       mmb_mark_buffer_dirty(prev_bh,
+                                             &AFFS_I(inode)->i_metadata_bhs);
                        affs_brelse(prev_bh);
                }
                size += bsize;
@@ -732,7 +733,7 @@ static int affs_write_end_ofs(const struct kiocb *iocb,
                AFFS_DATA_HEAD(bh)->size = cpu_to_be32(
                        max(boff + tmp, be32_to_cpu(AFFS_DATA_HEAD(bh)->size)));
                affs_fix_checksum(sb, bh);
-               mark_buffer_dirty_inode(bh, inode);
+               mmb_mark_buffer_dirty(bh, &AFFS_I(inode)->i_metadata_bhs);
                written += tmp;
                from += tmp;
                bidx++;
@@ -765,12 +766,13 @@ static int affs_write_end_ofs(const struct kiocb *iocb,
                                                     bidx, tmp_next);
                                AFFS_DATA_HEAD(prev_bh)->next = cpu_to_be32(bh->b_blocknr);
                                affs_adjust_checksum(prev_bh, bh->b_blocknr - tmp_next);
-                               mark_buffer_dirty_inode(prev_bh, inode);
+                               mmb_mark_buffer_dirty(prev_bh,
+                                       &AFFS_I(inode)->i_metadata_bhs);
                        }
                }
                affs_brelse(prev_bh);
                affs_fix_checksum(sb, bh);
-               mark_buffer_dirty_inode(bh, inode);
+               mmb_mark_buffer_dirty(bh, &AFFS_I(inode)->i_metadata_bhs);
                written += bsize;
                from += bsize;
                bidx++;
@@ -799,13 +801,14 @@ static int affs_write_end_ofs(const struct kiocb *iocb,
                                                     bidx, tmp_next);
                                AFFS_DATA_HEAD(prev_bh)->next = cpu_to_be32(bh->b_blocknr);
                                affs_adjust_checksum(prev_bh, bh->b_blocknr - tmp_next);
-                               mark_buffer_dirty_inode(prev_bh, inode);
+                               mmb_mark_buffer_dirty(prev_bh,
+                                               &AFFS_I(inode)->i_metadata_bhs);
                        }
                } else if (be32_to_cpu(AFFS_DATA_HEAD(bh)->size) < tmp)
                        AFFS_DATA_HEAD(bh)->size = cpu_to_be32(tmp);
                affs_brelse(prev_bh);
                affs_fix_checksum(sb, bh);
-               mark_buffer_dirty_inode(bh, inode);
+               mmb_mark_buffer_dirty(bh, &AFFS_I(inode)->i_metadata_bhs);
                written += tmp;
                from += tmp;
                bidx++;
@@ -942,7 +945,7 @@ affs_truncate(struct inode *inode)
        }
        AFFS_TAIL(sb, ext_bh)->extension = 0;
        affs_fix_checksum(sb, ext_bh);
-       mark_buffer_dirty_inode(ext_bh, inode);
+       mmb_mark_buffer_dirty(ext_bh, &AFFS_I(inode)->i_metadata_bhs);
        affs_brelse(ext_bh);
 
        if (inode->i_size) {

diff --git a/fs/affs/inode.c b/fs/affs/inode.c
index 84afa862f220dcfabec6ffee7132ffd07fcacb4e..51c71c7523a3425c5df481c557524afdf2800b33 100644 (file)
--- a/fs/affs/inode.c
+++ b/fs/affs/inode.c
@@ -206,7 +206,7 @@ affs_write_inode(struct inode *inode, struct writeback_control *wbc)
                }
        }
        affs_fix_checksum(sb, bh);
-       mark_buffer_dirty_inode(bh, inode);
+       mmb_mark_buffer_dirty(bh, &AFFS_I(inode)->i_metadata_bhs);
        affs_brelse(bh);
        affs_free_prealloc(inode);
        return 0;
@@ -268,10 +268,10 @@ affs_evict_inode(struct inode *inode)
                inode->i_size = 0;
                affs_truncate(inode);
        } else {
-               sync_mapping_buffers(&inode->i_data);
+               mmb_sync(&AFFS_I(inode)->i_metadata_bhs);
        }
 
-       invalidate_inode_buffers(inode);
+       mmb_invalidate(&AFFS_I(inode)->i_metadata_bhs);
        clear_inode(inode);
        affs_free_prealloc(inode);
        cache_page = (unsigned long)AFFS_I(inode)->i_lc;
@@ -306,7 +306,7 @@ affs_new_inode(struct inode *dir)
        bh = affs_getzeroblk(sb, block);
        if (!bh)
                goto err_bh;
-       mark_buffer_dirty_inode(bh, inode);
+       mmb_mark_buffer_dirty(bh, &AFFS_I(inode)->i_metadata_bhs);
        affs_brelse(bh);
 
        inode->i_uid     = current_fsuid();
@@ -394,17 +394,17 @@ affs_add_entry(struct inode *dir, struct inode *inode, struct dentry *dentry, s3
                AFFS_TAIL(sb, bh)->link_chain = chain;
                AFFS_TAIL(sb, inode_bh)->link_chain = cpu_to_be32(block);
                affs_adjust_checksum(inode_bh, block - be32_to_cpu(chain));
-               mark_buffer_dirty_inode(inode_bh, inode);
+               mmb_mark_buffer_dirty(inode_bh, &AFFS_I(inode)->i_metadata_bhs);
                set_nlink(inode, 2);
                ihold(inode);
        }
        affs_fix_checksum(sb, bh);
-       mark_buffer_dirty_inode(bh, inode);
+       mmb_mark_buffer_dirty(bh, &AFFS_I(inode)->i_metadata_bhs);
        dentry->d_fsdata = (void *)(long)bh->b_blocknr;
 
        affs_lock_dir(dir);
        retval = affs_insert_hash(dir, bh);
-       mark_buffer_dirty_inode(bh, inode);
+       mmb_mark_buffer_dirty(bh, &AFFS_I(inode)->i_metadata_bhs);
        affs_unlock_dir(dir);
        affs_unlock_link(inode);
 

diff --git a/fs/affs/namei.c b/fs/affs/namei.c
index f883be50db122d3b09f0ae4d24618bd49b55186b..23d00d85cf2187bc83b20faaaa6b143d2c76dce9 100644 (file)
--- a/fs/affs/namei.c
+++ b/fs/affs/namei.c
@@ -373,7 +373,7 @@ affs_symlink(struct mnt_idmap *idmap, struct inode *dir,
        }
        *p = 0;
        inode->i_size = i + 1;
-       mark_buffer_dirty_inode(bh, inode);
+       mmb_mark_buffer_dirty(bh, &AFFS_I(inode)->i_metadata_bhs);
        affs_brelse(bh);
        mark_inode_dirty(inode);
 
@@ -443,7 +443,8 @@ affs_rename(struct inode *old_dir, struct dentry *old_dentry,
        /* TODO: move it back to old_dir, if error? */
 
 done:
-       mark_buffer_dirty_inode(bh, retval ? old_dir : new_dir);
+       mmb_mark_buffer_dirty(bh,
+                       &AFFS_I(retval ? old_dir : new_dir)->i_metadata_bhs);
        affs_brelse(bh);
        return retval;
 }
@@ -496,8 +497,8 @@ affs_xrename(struct inode *old_dir, struct dentry *old_dentry,
        retval = affs_insert_hash(old_dir, bh_new);
        affs_unlock_dir(old_dir);
 done:
-       mark_buffer_dirty_inode(bh_old, new_dir);
-       mark_buffer_dirty_inode(bh_new, old_dir);
+       mmb_mark_buffer_dirty(bh_old, &AFFS_I(new_dir)->i_metadata_bhs);
+       mmb_mark_buffer_dirty(bh_new, &AFFS_I(old_dir)->i_metadata_bhs);
        affs_brelse(bh_old);
        affs_brelse(bh_new);
        return retval;

diff --git a/fs/affs/super.c b/fs/affs/super.c
index 8451647f3fea37d54713fe1127ce2a54927c2f71..079f36e1ddec13cbe3358d570a144635ccb6aaf3 100644 (file)
--- a/fs/affs/super.c
+++ b/fs/affs/super.c
@@ -108,6 +108,7 @@ static struct inode *affs_alloc_inode(struct super_block *sb)
        i->i_lc = NULL;
        i->i_ext_bh = NULL;
        i->i_pa_cnt = 0;
+       mmb_init(&i->i_metadata_bhs, &i->vfs_inode.i_data);
 
        return &i->vfs_inode;
 }