diff options
| author | Tristan Ye <tristan.ye@oracle.com> | 2010-08-19 15:15:00 +0800 |
|---|---|---|
| committer | Tao Ma <tao.ma@oracle.com> | 2010-09-08 14:25:57 +0800 |
| commit | 81c8c82b5a39f9127e8b239e9b406a6c3a41b228 (patch) | |
| tree | 960d5e11585afea6bb4e24a87fb73a975e16883c /fs/ocfs2 | |
| parent | 9b4c0ff32ccd87ab52d4c5bd0a0536febce11370 (diff) | |
| download | kernel_samsung_tuna-81c8c82b5a39f9127e8b239e9b406a6c3a41b228.zip kernel_samsung_tuna-81c8c82b5a39f9127e8b239e9b406a6c3a41b228.tar.gz kernel_samsung_tuna-81c8c82b5a39f9127e8b239e9b406a6c3a41b228.tar.bz2 | |
Ocfs2: Fix a regression bug from mainline commit(6b933c8e6f1a2f3118082c455eef25f9b1ac7b45).
The patch is to fix the regression bug brought from commit 6b933c8...( 'ocfs2:
Avoid direct write if we fall back to buffered I/O'):
http://oss.oracle.com/bugzilla/show_bug.cgi?id=1285
The commit 6b933c8e6f1a2f3118082c455eef25f9b1ac7b45 changed __generic_file_aio_write
to generic_file_buffered_write, which didn't call filemap_{write,wait}_range to flush
the pagecaches when we were falling O_DIRECT writes back to buffered ones. it did hurt
the O_DIRECT semantics somehow in extented odirect writes.
This patch tries to guarantee O_DIRECT writes of 'fall back to buffered' to be correctly
flushed.
Signed-off-by: Tristan Ye <tristan.ye@oracle.com>
Signed-off-by: Tao Ma <tao.ma@oracle.com>
Diffstat (limited to 'fs/ocfs2')
| -rw-r--r-- | fs/ocfs2/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 2caa3a7..9a03c15 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -2338,7 +2338,7 @@ out_dio: BUG_ON(ret == -EIOCBQUEUED && !(file->f_flags & O_DIRECT)); if (((file->f_flags & O_DSYNC) && !direct_io) || IS_SYNC(inode) || - ((file->f_flags & O_DIRECT) && has_refcount)) { + ((file->f_flags & O_DIRECT) && !direct_io)) { ret = filemap_fdatawrite_range(file->f_mapping, pos, pos + count - 1); if (ret < 0) |