Commit 0bb23039 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

Pull Reiserfs and GFS2 fixes from Jan Kara:
 "Fixes to GFS2 & Reiserfs for the fallout of the recent WRITE_FUA
  cleanup from Christoph.

  Fixes for other filesystems were already merged by respective
  maintainers."

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  reiserfs: Make flush bios explicitely sync
  gfs2: Make flush bios explicitely sync
parents 393bcfae d8747d64
...@@ -659,7 +659,7 @@ static void log_write_header(struct gfs2_sbd *sdp, u32 flags) ...@@ -659,7 +659,7 @@ static void log_write_header(struct gfs2_sbd *sdp, u32 flags)
struct gfs2_log_header *lh; struct gfs2_log_header *lh;
unsigned int tail; unsigned int tail;
u32 hash; u32 hash;
int op_flags = REQ_PREFLUSH | REQ_FUA | REQ_META; int op_flags = REQ_PREFLUSH | REQ_FUA | REQ_META | REQ_SYNC;
struct page *page = mempool_alloc(gfs2_page_pool, GFP_NOIO); struct page *page = mempool_alloc(gfs2_page_pool, GFP_NOIO);
enum gfs2_freeze_state state = atomic_read(&sdp->sd_freeze_state); enum gfs2_freeze_state state = atomic_read(&sdp->sd_freeze_state);
lh = page_address(page); lh = page_address(page);
......
...@@ -1112,7 +1112,7 @@ static int flush_commit_list(struct super_block *s, ...@@ -1112,7 +1112,7 @@ static int flush_commit_list(struct super_block *s,
depth = reiserfs_write_unlock_nested(s); depth = reiserfs_write_unlock_nested(s);
if (reiserfs_barrier_flush(s)) if (reiserfs_barrier_flush(s))
__sync_dirty_buffer(jl->j_commit_bh, __sync_dirty_buffer(jl->j_commit_bh,
REQ_PREFLUSH | REQ_FUA); REQ_SYNC | REQ_PREFLUSH | REQ_FUA);
else else
sync_dirty_buffer(jl->j_commit_bh); sync_dirty_buffer(jl->j_commit_bh);
reiserfs_write_lock_nested(s, depth); reiserfs_write_lock_nested(s, depth);
...@@ -1271,7 +1271,7 @@ static int _update_journal_header_block(struct super_block *sb, ...@@ -1271,7 +1271,7 @@ static int _update_journal_header_block(struct super_block *sb,
if (reiserfs_barrier_flush(sb)) if (reiserfs_barrier_flush(sb))
__sync_dirty_buffer(journal->j_header_bh, __sync_dirty_buffer(journal->j_header_bh,
REQ_PREFLUSH | REQ_FUA); REQ_SYNC | REQ_PREFLUSH | REQ_FUA);
else else
sync_dirty_buffer(journal->j_header_bh); sync_dirty_buffer(journal->j_header_bh);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment