From f18e854234a62d4831034b7debda63185e6c907d Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Fri, 22 Aug 2008 10:00:36 +0200 Subject: [PATCH] --- yaml --- r: 109187 b: refs/heads/master c: 48fd4f93a00eac844678629f2f00518e146ed30d h: refs/heads/master i: 109185: 2ceb9b545088e3cfe659e3d939c67ab9ec8d30e2 109183: e09d9f050c37e2bab96d60ee50b8485710662e55 v: v3 --- [refs] | 2 +- trunk/fs/buffer.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index ba260f4db217..c24e4d043a40 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4a778971b9cfcbedb8648ba502d801f7db04c47 +refs/heads/master: 48fd4f93a00eac844678629f2f00518e146ed30d diff --git a/trunk/fs/buffer.c b/trunk/fs/buffer.c index 38653e36e225..ac78d4c19b3b 100644 --- a/trunk/fs/buffer.c +++ b/trunk/fs/buffer.c @@ -2926,14 +2926,17 @@ int submit_bh(int rw, struct buffer_head * bh) BUG_ON(!buffer_mapped(bh)); BUG_ON(!bh->b_end_io); - if (buffer_ordered(bh) && (rw == WRITE)) - rw = WRITE_BARRIER; + /* + * Mask in barrier bit for a write (could be either a WRITE or a + * WRITE_SYNC + */ + if (buffer_ordered(bh) && (rw & WRITE)) + rw |= WRITE_BARRIER; /* - * Only clear out a write error when rewriting, should this - * include WRITE_SYNC as well? + * Only clear out a write error when rewriting */ - if (test_set_buffer_req(bh) && (rw == WRITE || rw == WRITE_BARRIER)) + if (test_set_buffer_req(bh) && (rw & WRITE)) clear_buffer_write_io_error(bh); /*