Skip to content

Commit 8a4fd33

Browse files
Zhihao Chengtytso
authored andcommitted
jbd2: remove unused 'JBD2_CHECKPOINT_IO_ERROR' and 'j_atomic_flags'
Since 'JBD2_CHECKPOINT_IO_ERROR' and j_atomic_flags' are not useful anymore after fs dev's errseq is imported into jbd2, just remove them. Signed-off-by: Zhihao Cheng <[email protected]> Reviewed-by: Jan Kara <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Theodore Ts'o <[email protected]>
1 parent 62ec170 commit 8a4fd33

File tree

2 files changed

+0
-22
lines changed

2 files changed

+0
-22
lines changed

fs/jbd2/checkpoint.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,6 @@ int __jbd2_journal_remove_checkpoint(struct journal_head *jh)
556556
struct transaction_chp_stats_s *stats;
557557
transaction_t *transaction;
558558
journal_t *journal;
559-
struct buffer_head *bh = jh2bh(jh);
560559

561560
JBUFFER_TRACE(jh, "entry");
562561

@@ -569,16 +568,6 @@ int __jbd2_journal_remove_checkpoint(struct journal_head *jh)
569568

570569
JBUFFER_TRACE(jh, "removing from transaction");
571570

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-
582571
__buffer_unlink(jh);
583572
jh->b_cp_transaction = NULL;
584573
percpu_counter_dec(&journal->j_checkpoint_jh_count);

include/linux/jbd2.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -755,11 +755,6 @@ struct journal_s
755755
*/
756756
unsigned long j_flags;
757757

758-
/**
759-
* @j_atomic_flags: Atomic journaling state flags.
760-
*/
761-
unsigned long j_atomic_flags;
762-
763758
/**
764759
* @j_errno:
765760
*
@@ -1406,12 +1401,6 @@ JBD2_FEATURE_INCOMPAT_FUNCS(fast_commit, FAST_COMMIT)
14061401
#define JBD2_JOURNAL_FLUSH_VALID (JBD2_JOURNAL_FLUSH_DISCARD | \
14071402
JBD2_JOURNAL_FLUSH_ZEROOUT)
14081403

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-
14151404
/*
14161405
* Function declarations for the journaling transaction and buffer
14171406
* management

0 commit comments

Comments
 (0)