File tree Expand file tree Collapse file tree 2 files changed +8
-11
lines changed Expand file tree Collapse file tree 2 files changed +8
-11
lines changed Original file line number Diff line number Diff line change @@ -353,7 +353,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
353
353
struct buffer_head * descriptor ;
354
354
struct buffer_head * * wbuf = journal -> j_wbuf ;
355
355
int bufs ;
356
- int flags ;
356
+ int escape ;
357
357
int err ;
358
358
unsigned long long blocknr ;
359
359
ktime_t start_time ;
@@ -660,10 +660,10 @@ void jbd2_journal_commit_transaction(journal_t *journal)
660
660
*/
661
661
set_bit (BH_JWrite , & jh2bh (jh )-> b_state );
662
662
JBUFFER_TRACE (jh , "ph3: write metadata" );
663
- flags = jbd2_journal_write_metadata_buffer (commit_transaction ,
663
+ escape = jbd2_journal_write_metadata_buffer (commit_transaction ,
664
664
jh , & wbuf [bufs ], blocknr );
665
- if (flags < 0 ) {
666
- jbd2_journal_abort (journal , flags );
665
+ if (escape < 0 ) {
666
+ jbd2_journal_abort (journal , escape );
667
667
continue ;
668
668
}
669
669
jbd2_file_log_bh (& io_bufs , wbuf [bufs ]);
@@ -672,7 +672,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
672
672
buffer */
673
673
674
674
tag_flag = 0 ;
675
- if (flags & 1 )
675
+ if (escape )
676
676
tag_flag |= JBD2_FLAG_ESCAPE ;
677
677
if (!first_tag )
678
678
tag_flag |= JBD2_FLAG_SAME_UUID ;
Original file line number Diff line number Diff line change @@ -316,11 +316,8 @@ static void journal_kill_thread(journal_t *journal)
316
316
*
317
317
* Return value:
318
318
* <0: Error
319
- * >=0: Finished OK
320
- *
321
- * On success:
322
- * Bit 0 set == escape performed on the data
323
- * Bit 1 set == buffer copy-out performed (kfree the data after IO)
319
+ * =0: Finished OK without escape
320
+ * =1: Finished OK with escape
324
321
*/
325
322
326
323
int jbd2_journal_write_metadata_buffer (transaction_t * transaction ,
@@ -455,7 +452,7 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction,
455
452
set_buffer_shadow (bh_in );
456
453
spin_unlock (& jh_in -> b_state_lock );
457
454
458
- return do_escape | ( done_copy_out << 1 ) ;
455
+ return do_escape ;
459
456
}
460
457
461
458
/*
You can’t perform that action at this time.
0 commit comments