diff options
| author | Dmitri Monakhov <dmonakhov@openvz.org> | 2008-10-27 21:01:49 +0100 |
|---|---|---|
| committer | Mark Fasheh <mfasheh@suse.com> | 2008-11-10 18:51:47 +0100 |
| commit | c435400140d24fbcb3da6b1e006be831f9056cb6 (patch) | |
| tree | 6f90cad133521a2a4d52a57149a41199bdf89367 /fs | |
| parent | ocfs2/xattr: Proper hash collision handle in bucket division (diff) | |
| download | linux-c435400140d24fbcb3da6b1e006be831f9056cb6.tar.xz linux-c435400140d24fbcb3da6b1e006be831f9056cb6.zip | |
ocfs2: truncate outstanding block after direct io failure
Signed-off-by: Dmitri Monakhov <dmonakhov@openvz.org>
Cc: Jeff Moyer <jmoyer@redhat.com>
Cc: Mark Fasheh <mark.fasheh@oracle.com>
Cc: Joel Becker <Joel.Becker@oracle.com>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ocfs2/file.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 3138a385fdbb..e2570a3bc2b2 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -1866,6 +1866,13 @@ relock: written = generic_file_direct_write(iocb, iov, &nr_segs, *ppos, ppos, count, ocount); if (written < 0) { + /* + * direct write may have instantiated a few + * blocks outside i_size. Trim these off again. + * Don't need i_size_read because we hold i_mutex. + */ + if (*ppos + count > inode->i_size) + vmtruncate(inode, inode->i_size); ret = written; goto out_dio; } |