diff options
| author | Jan Kara | 2012-04-07 12:33:03 +0200 |
|---|---|---|
| committer | Jan Kara | 2012-05-15 23:34:36 +0200 |
| commit | 9754e39c7bc51328f145e933bfb0df47cd67b6e9 (patch) | |
| tree | d2fa043f74939d049d6934aea6ab7b1c272be8a5 /include | |
| parent | ext2: do not register write_super within VFS (diff) | |
| download | kernel-qcow2-linux-9754e39c7bc51328f145e933bfb0df47cd67b6e9.tar.gz kernel-qcow2-linux-9754e39c7bc51328f145e933bfb0df47cd67b6e9.tar.xz kernel-qcow2-linux-9754e39c7bc51328f145e933bfb0df47cd67b6e9.zip | |
jbd: Split updating of journal superblock and marking journal empty
There are three case of updating journal superblock. In the first case, we want
to mark journal as empty (setting s_sequence to 0), in the second case we want
to update log tail, in the third case we want to update s_errno. Split these
cases into separate functions. It makes the code slightly more straightforward
and later patches will make the distinction even more important.
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/jbd.h | 2 | ||||
| -rw-r--r-- | include/trace/events/jbd.h | 12 |
2 files changed, 5 insertions, 9 deletions
diff --git a/include/linux/jbd.h b/include/linux/jbd.h index f265682ae134..9716d370c501 100644 --- a/include/linux/jbd.h +++ b/include/linux/jbd.h @@ -864,7 +864,7 @@ extern int journal_destroy (journal_t *); extern int journal_recover (journal_t *journal); extern int journal_wipe (journal_t *, int); extern int journal_skip_recovery (journal_t *); -extern void journal_update_superblock (journal_t *, int); +extern void journal_update_sb_log_tail (journal_t *); extern void journal_abort (journal_t *, int); extern int journal_errno (journal_t *); extern void journal_ack_err (journal_t *); diff --git a/include/trace/events/jbd.h b/include/trace/events/jbd.h index 9305e1b5edc3..d9658a940a39 100644 --- a/include/trace/events/jbd.h +++ b/include/trace/events/jbd.h @@ -169,24 +169,20 @@ TRACE_EVENT(jbd_cleanup_journal_tail, __entry->block_nr, __entry->freed) ); -TRACE_EVENT(jbd_update_superblock_end, - TP_PROTO(journal_t *journal, int wait), +TRACE_EVENT(journal_write_superblock, + TP_PROTO(journal_t *journal), - TP_ARGS(journal, wait), + TP_ARGS(journal), TP_STRUCT__entry( __field( dev_t, dev ) - __field( int, wait ) ), TP_fast_assign( __entry->dev = journal->j_fs_dev->bd_dev; - __entry->wait = wait; ), - TP_printk("dev %d,%d wait %d", - MAJOR(__entry->dev), MINOR(__entry->dev), - __entry->wait) + TP_printk("dev %d,%d", MAJOR(__entry->dev), MINOR(__entry->dev)) ); #endif /* _TRACE_JBD_H */ |