From 278c487c8b14311bb5888e73709790188beebf63 Mon Sep 17 00:00:00 2001 From: Jeff Moyer Date: Fri, 2 Oct 2009 18:56:53 -0400 Subject: [PATCH] --- yaml --- r: 172916 b: refs/heads/master c: 1af60fbd759d31f565552fea315c2033947cfbe6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/direct-io.c | 2 +- trunk/include/linux/fs.h | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 528babaeb48c..8114b82bd0d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a1238a7dd48e48b3bba8f426a1d61c22c80d6d1 +refs/heads/master: 1af60fbd759d31f565552fea315c2033947cfbe6 diff --git a/trunk/fs/direct-io.c b/trunk/fs/direct-io.c index 8b10b87dc01a..c86d35f142de 100644 --- a/trunk/fs/direct-io.c +++ b/trunk/fs/direct-io.c @@ -1124,7 +1124,7 @@ __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode, int acquire_i_mutex = 0; if (rw & WRITE) - rw = WRITE_ODIRECT; + rw = WRITE_SYNC_PLUG; if (bdev) bdev_blkbits = blksize_bits(bdev_logical_block_size(bdev)); diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h index 2620a8c63571..2f5fca4147c2 100644 --- a/trunk/include/linux/fs.h +++ b/trunk/include/linux/fs.h @@ -129,7 +129,6 @@ struct inodes_stat_t { * WRITE_SYNC Like WRITE_SYNC_PLUG, but also unplugs the device * immediately after submission. The write equivalent * of READ_SYNC. - * WRITE_ODIRECT Special case write for O_DIRECT only. * SWRITE_SYNC * SWRITE_SYNC_PLUG Like WRITE_SYNC/WRITE_SYNC_PLUG, but locks the buffer. * See SWRITE. @@ -151,7 +150,6 @@ struct inodes_stat_t { #define READ_META (READ | (1 << BIO_RW_META)) #define WRITE_SYNC_PLUG (WRITE | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_NOIDLE)) #define WRITE_SYNC (WRITE_SYNC_PLUG | (1 << BIO_RW_UNPLUG)) -#define WRITE_ODIRECT (WRITE | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_UNPLUG)) #define SWRITE_SYNC_PLUG \ (SWRITE | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_NOIDLE)) #define SWRITE_SYNC (SWRITE_SYNC_PLUG | (1 << BIO_RW_UNPLUG))