diff options
| author |   Andreas Gruenbacher <agruenba@redhat.com> | 2018-06-06 20:30:38 +0100 |
|---|---|---|
| committer | Andreas Gruenbacher <agruenba@redhat.com> | 2018-07-25 00:08:49 +0200 |
| commit | f95cbb44abf9d6545769147d5abec4770c89872d (patch) | |
| tree | 5a440755b5f26fb4cc3fec89b0b27d732ad53585 /fs/gfs2 | |
| parent | gfs2: Use iomap for stuffed direct I/O reads (diff) | |
| download | linux-dev-f95cbb44abf9d6545769147d5abec4770c89872d.tar.xz linux-dev-f95cbb44abf9d6545769147d5abec4770c89872d.zip | |
gfs2: use iomap_readpage for blocksize == PAGE_SIZE
We only use iomap_readpage for pages that don't have buffer heads
attached yet: iomap_readpage would otherwise read pages from disk that
are marked buffer_uptodate() but not PageUptodate(). Those pages may
actually contain data more recent than what's on disk.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: Bob Peterson <rpeterso@redhat.com>
Diffstat (limited to 'fs/gfs2')
| -rw-r--r-- | fs/gfs2/aops.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c index cc80fd71f3dd..31e8270d0b26 100644 --- a/fs/gfs2/aops.c +++ b/fs/gfs2/aops.c @@ -508,9 +508,13 @@ static int __gfs2_readpage(void *file, struct page *page) { struct gfs2_inode *ip = GFS2_I(page->mapping->host); struct gfs2_sbd *sdp = GFS2_SB(page->mapping->host); + int error; - if (gfs2_is_stuffed(ip)) { + if (i_blocksize(page->mapping->host) == PAGE_SIZE && + !page_has_buffers(page)) { + error = iomap_readpage(page, &gfs2_iomap_ops); + } else if (gfs2_is_stuffed(ip)) { error = stuffed_readpage(ip, page); unlock_page(page); } else { |