diff options
| author | Jens Axboe <axboe@kernel.dk> | 2017-06-12 16:30:13 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2017-06-12 16:30:13 +0200 |
| commit | 8f66439eec46d652255b9351abebb540ee5b2fd9 (patch) | |
| tree | 94f4a41dc343cf769cd92f1f7711e9ce8ad43728 /fs/reiserfs/journal.c | |
| parent | dm: bump DM_VERSION_MINOR in response to target method error code changes (diff) | |
| parent | Linux 4.12-rc5 (diff) | |
| download | linux-8f66439eec46d652255b9351abebb540ee5b2fd9.tar.xz linux-8f66439eec46d652255b9351abebb540ee5b2fd9.zip | |
Merge tag 'v4.12-rc5' into for-4.13/block
We've already got a few conflicts and upcoming work depends on some of the
changes that have gone into mainline as regression fixes for this series.
Pull in 4.12-rc5 to resolve these conflicts and make it easier on down stream
trees to continue working on 4.13 changes.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/reiserfs/journal.c')
| -rw-r--r-- | fs/reiserfs/journal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c index da01f497180a..39bb1e838d8d 100644 --- a/fs/reiserfs/journal.c +++ b/fs/reiserfs/journal.c @@ -1112,7 +1112,7 @@ static int flush_commit_list(struct super_block *s, depth = reiserfs_write_unlock_nested(s); if (reiserfs_barrier_flush(s)) __sync_dirty_buffer(jl->j_commit_bh, - REQ_PREFLUSH | REQ_FUA); + REQ_SYNC | REQ_PREFLUSH | REQ_FUA); else sync_dirty_buffer(jl->j_commit_bh); reiserfs_write_lock_nested(s, depth); @@ -1271,7 +1271,7 @@ static int _update_journal_header_block(struct super_block *sb, if (reiserfs_barrier_flush(sb)) __sync_dirty_buffer(journal->j_header_bh, - REQ_PREFLUSH | REQ_FUA); + REQ_SYNC | REQ_PREFLUSH | REQ_FUA); else sync_dirty_buffer(journal->j_header_bh); |