diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /fs/reiserfs/fix_node.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'fs/reiserfs/fix_node.c')
| -rw-r--r-- | fs/reiserfs/fix_node.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/reiserfs/fix_node.c b/fs/reiserfs/fix_node.c index 5e5a4e6fbaf8..db3fd7d0b990 100644 --- a/fs/reiserfs/fix_node.c +++ b/fs/reiserfs/fix_node.c | |||
| @@ -834,7 +834,7 @@ static int get_empty_nodes(struct tree_balance *tb, int h) | |||
| 834 | RFALSE(buffer_dirty(new_bh) || | 834 | RFALSE(buffer_dirty(new_bh) || |
| 835 | buffer_journaled(new_bh) || | 835 | buffer_journaled(new_bh) || |
| 836 | buffer_journal_dirty(new_bh), | 836 | buffer_journal_dirty(new_bh), |
| 837 | "PAP-8140: journlaled or dirty buffer %b for the new block", | 837 | "PAP-8140: journaled or dirty buffer %b for the new block", |
| 838 | new_bh); | 838 | new_bh); |
| 839 | 839 | ||
| 840 | /* Put empty buffers into the array. */ | 840 | /* Put empty buffers into the array. */ |