Skip to contentSkip to conversation

ext4: remove tl argument from ext4_fc_replay_{add,del}_range

PATCH Applied Guoqing Jiang 3 participants 3 messages Jan 21 – Apr 10 ext4 file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ext4: remove tl argument from ext4_fc_replay_{add,del}_range

Since commit a7ba36bc94f2 ("ext4: fix fast commit alignment issues"), both ext4_fc_replay_add_range and ext4_fc_replay_del_range get ex based on 'val' instead of 'tl'.

---
 fs/ext4/fast_commit.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
fs/ext4/fast_commit.c +4 -6
index fa66b08de999..8474ae52f8dd 100644
@@ -1751,8 +1751,7 @@ int ext4_fc_record_regions(struct super_block *sb, int ino,
 }
 
 /* Replay add range tag */
-static int ext4_fc_replay_add_range(struct super_block *sb,
-				    struct ext4_fc_tl_mem *tl, u8 *val)
+static int ext4_fc_replay_add_range(struct super_block *sb, u8 *val)
 {
 	struct ext4_fc_add_range fc_add_ex;
 	struct ext4_extent newex, *ex;
@@ -1872,8 +1871,7 @@ static int ext4_fc_replay_add_range(struct super_block *sb,
 
 /* Replay DEL_RANGE tag */
 static int
-ext4_fc_replay_del_range(struct super_block *sb,
-			 struct ext4_fc_tl_mem *tl, u8 *val)
+ext4_fc_replay_del_range(struct super_block *sb, u8 *val)
 {
 	struct inode *inode;
 	struct ext4_fc_del_range lrange;
@@ -2243,13 +2241,13 @@ static int ext4_fc_replay(journal_t *journal, struct buffer_head *bh,
 			ret = ext4_fc_replay_unlink(sb, &tl, val);
 			break;
 		case EXT4_FC_TAG_ADD_RANGE:
-			ret = ext4_fc_replay_add_range(sb, &tl, val);
+			ret = ext4_fc_replay_add_range(sb, val);
 			break;
 		case EXT4_FC_TAG_CREAT:
 			ret = ext4_fc_replay_create(sb, &tl, val);
 			break;
 		case EXT4_FC_TAG_DEL_RANGE:
-			ret = ext4_fc_replay_del_range(sb, &tl, val);
+			ret = ext4_fc_replay_del_range(sb, val);
 			break;
 		case EXT4_FC_TAG_INODE:
 			ret = ext4_fc_replay_inode(sb, &tl, val);
Signature · 1 line
2.43.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Guoqing Jiang

Since commit a7ba36bc94f2 ("ext4: fix fast commit alignment issues"), both ext4_fc_replay_add_range and ext4_fc_replay_del_range get ex based on 'val' instead of 'tl'.

Thank you for the cleanup, it looks good to me.

Quoted 44 lines
---
  fs/ext4/fast_commit.c | 10 ++++------
  1 file changed, 4 insertions(+), 6 deletions(-)
fs/ext4/fast_commit.c +4 -6
index fa66b08de999..8474ae52f8dd 100644
@@ -1751,8 +1751,7 @@ int ext4_fc_record_regions(struct super_block *sb, int ino,
  }
 
  /* Replay add range tag */
-static int ext4_fc_replay_add_range(struct super_block *sb,
-				    struct ext4_fc_tl_mem *tl, u8 *val)
+static int ext4_fc_replay_add_range(struct super_block *sb, u8 *val)
  {
  	struct ext4_fc_add_range fc_add_ex;
  	struct ext4_extent newex, *ex;
@@ -1872,8 +1871,7 @@ static int ext4_fc_replay_add_range(struct super_block *sb,
 
  /* Replay DEL_RANGE tag */
  static int
-ext4_fc_replay_del_range(struct super_block *sb,
-			 struct ext4_fc_tl_mem *tl, u8 *val)
+ext4_fc_replay_del_range(struct super_block *sb, u8 *val)
  {
  	struct inode *inode;
  	struct ext4_fc_del_range lrange;
@@ -2243,13 +2241,13 @@ static int ext4_fc_replay(journal_t *journal, struct buffer_head *bh,
  			ret = ext4_fc_replay_unlink(sb, &tl, val);
  			break;
  		case EXT4_FC_TAG_ADD_RANGE:
-			ret = ext4_fc_replay_add_range(sb, &tl, val);
+			ret = ext4_fc_replay_add_range(sb, val);
  			break;
  		case EXT4_FC_TAG_CREAT:
  			ret = ext4_fc_replay_create(sb, &tl, val);
  			break;
  		case EXT4_FC_TAG_DEL_RANGE:
-			ret = ext4_fc_replay_del_range(sb, &tl, val);
+			ret = ext4_fc_replay_del_range(sb, val);
  			break;
  		case EXT4_FC_TAG_INODE:
  			ret = ext4_fc_replay_inode(sb, &tl, val);
maintainer Applied
#2 lore raw
In reply to Guoqing Jiang
Quoted 3 lines · Guoqing Jiang

Since commit a7ba36bc94f2 ("ext4: fix fast commit alignment issues"), both ext4_fc_replay_add_range and ext4_fc_replay_del_range get ex based on 'val' instead of 'tl'.

Applied, thanks!

[1/1] ext4: remove tl argument from ext4_fc_replay_{add,del}_range

      commit: 2f17d1993b01960579761284e9a0da533a7a82fa

Best regards,

Signature · 1 line
Theodore Ts'o <[email protected]>