* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: ocfs2: Silence gcc warning in ocfs2_write_zero_page(). jbd2/ocfs2: Fix block checksumming when a buffer is used in several transactions ocfs2/dlm: Remove BUG_ON from migration in the rare case of a down node ocfs2: Don't duplicate pages past i_size during CoW. ocfs2: tighten up strlen() checking ocfs2: Make xattr reflink work with new local alloc reservation. ocfs2: make xattr extension work with new local alloc reservation. ocfs2: Remove the redundant cpu_to_le64. ocfs2/dlm: don't access beyond bitmap size ocfs2: No need to zero pages past i_size. ocfs2: Zero the tail cluster when extending past i_size. ocfs2: When zero extending, do it by page. ocfs2: Limit default local alloc size within bitmap range. ocfs2: Move orphan scan work to ocfs2_wq. fs/ocfs2/dlm: Add missing spin_unlock
Showing the changes to include (1 of 16 files). Show all
Unified · Split
| @@ -1026,11 +1026,12 @@ void __jbd2_journal_insert_checkpoint(struct journal_head *, transaction_t *); · 1025 unmodified lines | ||
| 1026 | 1026 | |
| 1027 | 1027 | struct jbd2_buffer_trigger_type { |
| 1028 | 1028 | /* |
| 1029 | − * Fired just before a buffer is written to the journal. | |
| 1030 | − * mapped_data is a mapped buffer that is the frozen data for | |
| 1031 | − * commit. | |
| 1029 | + * Fired a the moment data to write to the journal are known to be | |
| 1030 | + * stable - so either at the moment b_frozen_data is created or just | |
| 1031 | + * before a buffer is written to the journal. mapped_data is a mapped | |
| 1032 | + * buffer that is the frozen data for commit. | |
| 1032 | 1033 | */ |
| 1033 | − void (*t_commit)(struct jbd2_buffer_trigger_type *type, | |
| 1034 | + void (*t_frozen)(struct jbd2_buffer_trigger_type *type, | |
| 1034 | 1035 | struct buffer_head *bh, void *mapped_data, |
| 1035 | 1036 | size_t size); |
| 1036 | 1037 | |
| @@ -1042,7 +1043,7 @@ struct jbd2_buffer_trigger_type { · 5 unmodified lines | ||
| 1042 | 1043 | struct buffer_head *bh); |
| 1043 | 1044 | }; |
| 1044 | 1045 | |
| 1045 | −extern void jbd2_buffer_commit_trigger(struct journal_head *jh, | |
| 1046 | +extern void jbd2_buffer_frozen_trigger(struct journal_head *jh, | |
| 1046 | 1047 | void *mapped_data, |
| 1047 | 1048 | struct jbd2_buffer_trigger_type *triggers); |
| 1048 | 1049 | extern void jbd2_buffer_abort_trigger(struct journal_head *jh, |