From ac5804eb8521bea5c1ec1b7e07ad87c469bf7437 Mon Sep 17 00:00:00 2001 From: Qu Wenruo Date: Thu, 25 Mar 2021 15:14:34 +0800 Subject: [PATCH] btrfs: use min() to replace open-code in btrfs_invalidatepage() In btrfs_invalidatepage() we introduce a temporary variable, new_len, to update ordered->truncated_len. But we can use min() to replace it completely and no need for the variable. Reviewed-by: Anand Jain Signed-off-by: Qu Wenruo Reviewed-by: David Sterba Signed-off-by: David Sterba --- fs/btrfs/inode.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 1e0e20a..18408b9 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -8414,15 +8414,13 @@ again: */ if (TestClearPagePrivate2(page)) { struct btrfs_ordered_inode_tree *tree; - u64 new_len; tree = &inode->ordered_tree; spin_lock_irq(&tree->lock); set_bit(BTRFS_ORDERED_TRUNCATED, &ordered->flags); - new_len = start - ordered->file_offset; - if (new_len < ordered->truncated_len) - ordered->truncated_len = new_len; + ordered->truncated_len = min(ordered->truncated_len, + start - ordered->file_offset); spin_unlock_irq(&tree->lock); if (btrfs_dec_test_ordered_pending(inode, &ordered, -- 2.7.4