File tree Expand file tree Collapse file tree 2 files changed +0
-22
lines changed Expand file tree Collapse file tree 2 files changed +0
-22
lines changed Original file line number Diff line number Diff line change @@ -556,7 +556,6 @@ int __jbd2_journal_remove_checkpoint(struct journal_head *jh)
556
556
struct transaction_chp_stats_s * stats ;
557
557
transaction_t * transaction ;
558
558
journal_t * journal ;
559
- struct buffer_head * bh = jh2bh (jh );
560
559
561
560
JBUFFER_TRACE (jh , "entry" );
562
561
@@ -569,16 +568,6 @@ int __jbd2_journal_remove_checkpoint(struct journal_head *jh)
569
568
570
569
JBUFFER_TRACE (jh , "removing from transaction" );
571
570
572
- /*
573
- * If we have failed to write the buffer out to disk, the filesystem
574
- * may become inconsistent. We cannot abort the journal here since
575
- * we hold j_list_lock and we have to be careful about races with
576
- * jbd2_journal_destroy(). So mark the writeback IO error in the
577
- * journal here and we abort the journal later from a better context.
578
- */
579
- if (buffer_write_io_error (bh ))
580
- set_bit (JBD2_CHECKPOINT_IO_ERROR , & journal -> j_atomic_flags );
581
-
582
571
__buffer_unlink (jh );
583
572
jh -> b_cp_transaction = NULL ;
584
573
percpu_counter_dec (& journal -> j_checkpoint_jh_count );
Original file line number Diff line number Diff line change @@ -755,11 +755,6 @@ struct journal_s
755
755
*/
756
756
unsigned long j_flags ;
757
757
758
- /**
759
- * @j_atomic_flags: Atomic journaling state flags.
760
- */
761
- unsigned long j_atomic_flags ;
762
-
763
758
/**
764
759
* @j_errno:
765
760
*
@@ -1406,12 +1401,6 @@ JBD2_FEATURE_INCOMPAT_FUNCS(fast_commit, FAST_COMMIT)
1406
1401
#define JBD2_JOURNAL_FLUSH_VALID (JBD2_JOURNAL_FLUSH_DISCARD | \
1407
1402
JBD2_JOURNAL_FLUSH_ZEROOUT)
1408
1403
1409
- /*
1410
- * Journal atomic flag definitions
1411
- */
1412
- #define JBD2_CHECKPOINT_IO_ERROR 0x001 /* Detect io error while writing
1413
- * buffer back to disk */
1414
-
1415
1404
/*
1416
1405
* Function declarations for the journaling transaction and buffer
1417
1406
* management
You can’t perform that action at this time.
0 commit comments