diff options
-rw-r--r-- | fs/gfs2/log.c | 2 | ||||
-rw-r--r-- | include/linux/fs.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c index 6a857e24f947..efc3539ac5a1 100644 --- a/fs/gfs2/log.c +++ b/fs/gfs2/log.c | |||
@@ -595,7 +595,7 @@ static void log_write_header(struct gfs2_sbd *sdp, u32 flags, int pull) | |||
595 | if (test_bit(SDF_NOBARRIERS, &sdp->sd_flags)) | 595 | if (test_bit(SDF_NOBARRIERS, &sdp->sd_flags)) |
596 | goto skip_barrier; | 596 | goto skip_barrier; |
597 | get_bh(bh); | 597 | get_bh(bh); |
598 | submit_bh(WRITE_SYNC | (1 << BIO_RW_BARRIER) | (1 << BIO_RW_META), bh); | 598 | submit_bh(WRITE_BARRIER | (1 << BIO_RW_META), bh); |
599 | wait_on_buffer(bh); | 599 | wait_on_buffer(bh); |
600 | if (buffer_eopnotsupp(bh)) { | 600 | if (buffer_eopnotsupp(bh)) { |
601 | clear_buffer_eopnotsupp(bh); | 601 | clear_buffer_eopnotsupp(bh); |
diff --git a/include/linux/fs.h b/include/linux/fs.h index 68ca1b0491af..598878831497 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -136,7 +136,7 @@ struct inodes_stat_t { | |||
136 | * SWRITE_SYNC | 136 | * SWRITE_SYNC |
137 | * SWRITE_SYNC_PLUG Like WRITE_SYNC/WRITE_SYNC_PLUG, but locks the buffer. | 137 | * SWRITE_SYNC_PLUG Like WRITE_SYNC/WRITE_SYNC_PLUG, but locks the buffer. |
138 | * See SWRITE. | 138 | * See SWRITE. |
139 | * WRITE_BARRIER Like WRITE, but tells the block layer that all | 139 | * WRITE_BARRIER Like WRITE_SYNC, but tells the block layer that all |
140 | * previously submitted writes must be safely on storage | 140 | * previously submitted writes must be safely on storage |
141 | * before this one is started. Also guarantees that when | 141 | * before this one is started. Also guarantees that when |
142 | * this write is complete, it itself is also safely on | 142 | * this write is complete, it itself is also safely on |
@@ -159,7 +159,7 @@ struct inodes_stat_t { | |||
159 | #define SWRITE_SYNC_PLUG \ | 159 | #define SWRITE_SYNC_PLUG \ |
160 | (SWRITE | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_NOIDLE)) | 160 | (SWRITE | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_NOIDLE)) |
161 | #define SWRITE_SYNC (SWRITE_SYNC_PLUG | (1 << BIO_RW_UNPLUG)) | 161 | #define SWRITE_SYNC (SWRITE_SYNC_PLUG | (1 << BIO_RW_UNPLUG)) |
162 | #define WRITE_BARRIER (WRITE | (1 << BIO_RW_BARRIER)) | 162 | #define WRITE_BARRIER (WRITE_SYNC | (1 << BIO_RW_BARRIER)) |
163 | 163 | ||
164 | /* | 164 | /* |
165 | * These aren't really reads or writes, they pass down information about | 165 | * These aren't really reads or writes, they pass down information about |