diff options
| author | Dave Chinner <dchinner@redhat.com> | 2014-09-02 12:12:52 +1000 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-09-17 17:06:52 +0200 |
| commit | a241067d53187f0b9bc06956da5f0152398a9405 (patch) | |
| tree | 5ff1c2075749f0e52eb4e931e925b6027edd39da | |
| parent | ff88bc8d71e4ac5143bb22dbe32ebd594f5fe4fe (diff) | |
| download | lwn-a241067d53187f0b9bc06956da5f0152398a9405.tar.gz lwn-a241067d53187f0b9bc06956da5f0152398a9405.zip | |
xfs: don't zero partial page cache pages during O_DIRECT writes
commit 834ffca6f7e345a79f6f2e2d131b0dfba8a4b67a upstream.
Similar to direct IO reads, direct IO writes are using
truncate_pagecache_range to invalidate the page cache. This is
incorrect due to the sub-block zeroing in the page cache that
truncate_pagecache_range() triggers.
This patch fixes things by using invalidate_inode_pages2_range
instead. It preserves the page cache invalidation, but won't zero
any pages.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | fs/xfs/xfs_file.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index 4c749ab543d0..3e0fccf54ed5 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -678,7 +678,15 @@ xfs_file_dio_aio_write( pos, -1); if (ret) goto out; - truncate_pagecache_range(VFS_I(ip), pos, -1); + /* + * Invalidate whole pages. This can return an error if + * we fail to invalidate a page, but this should never + * happen on XFS. Warn if it does fail. + */ + ret = invalidate_inode_pages2_range(VFS_I(ip)->i_mapping, + pos >> PAGE_CACHE_SHIFT, -1); + WARN_ON_ONCE(ret); + ret = 0; } /* |