ext4: make ext4_da_reserve_space() reserve multi-clusters

Add 'nr_resv' parameter to ext4_da_reserve_space(), which indicates the
number of clusters wants to reserve, make it reserve multiple clusters
at a time.

Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://patch.msgid.link/20240517124005.347221-8-yi.zhang@huaweicloud.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index c55f1607b7d8147e4664ed9b76e149cb8a46e37b..8e5815b30b5facfc9c6d520193a6d9cda4b2d676 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -1479,9 +1479,9 @@ static int ext4_journalled_write_end(struct file *file,
 }
 
 /*
- * Reserve space for a single cluster
+ * Reserve space for 'nr_resv' clusters
  */
-static int ext4_da_reserve_space(struct inode *inode)
+static int ext4_da_reserve_space(struct inode *inode, int nr_resv)
 {
        struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
        struct ext4_inode_info *ei = EXT4_I(inode);
@@ -1492,18 +1492,18 @@ static int ext4_da_reserve_space(struct inode *inode)
         * us from metadata over-estimation, though we may go over by
         * a small amount in the end.  Here we just reserve for data.
         */
-       ret = dquot_reserve_block(inode, EXT4_C2B(sbi, 1));
+       ret = dquot_reserve_block(inode, EXT4_C2B(sbi, nr_resv));
        if (ret)
                return ret;
 
        spin_lock(&ei->i_block_reservation_lock);
-       if (ext4_claim_free_clusters(sbi, 1, 0)) {
+       if (ext4_claim_free_clusters(sbi, nr_resv, 0)) {
                spin_unlock(&ei->i_block_reservation_lock);
-               dquot_release_reservation_block(inode, EXT4_C2B(sbi, 1));
+               dquot_release_reservation_block(inode, EXT4_C2B(sbi, nr_resv));
                return -ENOSPC;
        }
-       ei->i_reserved_data_blocks++;
-       trace_ext4_da_reserve_space(inode);
+       ei->i_reserved_data_blocks += nr_resv;
+       trace_ext4_da_reserve_space(inode, nr_resv);
        spin_unlock(&ei->i_block_reservation_lock);
 
        return 0;       /* success */
@@ -1678,7 +1678,7 @@ static int ext4_insert_delayed_block(struct inode *inode, ext4_lblk_t lblk)
         * extents status tree doesn't get a match.
         */
        if (sbi->s_cluster_ratio == 1) {
-               ret = ext4_da_reserve_space(inode);
+               ret = ext4_da_reserve_space(inode, 1);
                if (ret != 0)   /* ENOSPC */
                        return ret;
        } else {   /* bigalloc */
@@ -1690,7 +1690,7 @@ static int ext4_insert_delayed_block(struct inode *inode, ext4_lblk_t lblk)
                                if (ret < 0)
                                        return ret;
                                if (ret == 0) {
-                                       ret = ext4_da_reserve_space(inode);
+                                       ret = ext4_da_reserve_space(inode, 1);
                                        if (ret != 0)   /* ENOSPC */
                                                return ret;
                                } else {

diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index 6b41ac61310fdc6bd14c2abe0e6fbf8170c64644..cc5e9b7b2b44e717bb3ad7e92c4d1c1d759fb580 100644 (file)
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -1246,14 +1246,15 @@ TRACE_EVENT(ext4_da_update_reserve_space,
 );
 
 TRACE_EVENT(ext4_da_reserve_space,
-       TP_PROTO(struct inode *inode),
+       TP_PROTO(struct inode *inode, int nr_resv),
 
-       TP_ARGS(inode),
+       TP_ARGS(inode, nr_resv),
 
        TP_STRUCT__entry(
                __field(        dev_t,  dev                     )
                __field(        ino_t,  ino                     )
                __field(        __u64,  i_blocks                )
+               __field(        int,    reserve_blocks          )
                __field(        int,    reserved_data_blocks    )
                __field(        __u16,  mode                    )
        ),
@@ -1262,16 +1263,17 @@ TRACE_EVENT(ext4_da_reserve_space,
                __entry->dev    = inode->i_sb->s_dev;
                __entry->ino    = inode->i_ino;
                __entry->i_blocks = inode->i_blocks;
+               __entry->reserve_blocks = nr_resv;
                __entry->reserved_data_blocks = EXT4_I(inode)->i_reserved_data_blocks;
                __entry->mode   = inode->i_mode;
        ),
 
-       TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu "
+       TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu reserve_blocks %d"
                  "reserved_data_blocks %d",
                  MAJOR(__entry->dev), MINOR(__entry->dev),
                  (unsigned long) __entry->ino,
                  __entry->mode, __entry->i_blocks,
-                 __entry->reserved_data_blocks)
+                 __entry->reserve_blocks, __entry->reserved_data_blocks)
 );
 
 TRACE_EVENT(ext4_da_release_space,