]> www.infradead.org Git - linux.git/commitdiff
jbd2: remove unnedded "need_copy_out" in jbd2_journal_write_metadata_buffer
authorKemeng Shi <shikemeng@huaweicloud.com>
Tue, 14 May 2024 11:24:32 +0000 (19:24 +0800)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 27 Jun 2024 14:20:26 +0000 (10:20 -0400)
As we only need to copy out when we should do escape, need_copy_out
could be simply replaced by "do_escape".

Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
Reviewed-by: Zhang Yi <yi.zhang@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://patch.msgid.link/20240514112438.1269037-4-shikemeng@huaweicloud.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
fs/jbd2/journal.c

index 667272239889314ae993f48d8967360029e66ad5..3a7695bfb76f4c7fb7453e66bae249ad7ef6997d 100644 (file)
@@ -325,7 +325,6 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction,
                                  struct buffer_head **bh_out,
                                  sector_t blocknr)
 {
-       int need_copy_out = 0;
        int done_copy_out = 0;
        int do_escape = 0;
        char *mapped_data;
@@ -380,16 +379,14 @@ repeat:
        /*
         * Check for escaping
         */
-       if (*((__be32 *)mapped_data) == cpu_to_be32(JBD2_MAGIC_NUMBER)) {
-               need_copy_out = 1;
+       if (*((__be32 *)mapped_data) == cpu_to_be32(JBD2_MAGIC_NUMBER))
                do_escape = 1;
-       }
        kunmap_local(mapped_data);
 
        /*
         * Do we need to do a data copy?
         */
-       if (need_copy_out && !done_copy_out) {
+       if (do_escape && !done_copy_out) {
                char *tmp;
 
                spin_unlock(&jh_in->b_state_lock);