From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Gruenbacher Date: Tue, 10 Dec 2019 11:19:38 +0100 Subject: [Cluster-devel] [PATCH 15/15] gfs2: use iomap for buffered I/O in ordered and writeback mode Message-ID: <20191210101938.495-1-agruenba@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Hi Christoph, On Mon, Sep 30, 2019 at 10:49 PM Andreas Gruenbacher wrote: > On Tue, Aug 6, 2019 at 7:30 AM Christoph Hellwig wrote: > > On Mon, Aug 05, 2019 at 02:27:21PM +0200, Andreas Gruenbacher wrote: > here are the changes we currently need on top of what you've posted on > July 1. [...] again, thank you for this patch. After fixing some related bugs around this change, it seems I've finally got this to work properly. Below are the minor changes I needed to make on top of your version. This requires functions iomap_page_create and iomap_set_range_uptodate to be exported; i'll post a patch for that sepatately. The result can be found here: git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git for-next.iomap Thanks, Andreas --- fs/gfs2/bmap.c | 6 ++++-- fs/gfs2/file.c | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c index 168ac5147dd0..fcd2043fc466 100644 --- a/fs/gfs2/bmap.c +++ b/fs/gfs2/bmap.c @@ -75,13 +75,12 @@ static int gfs2_unstuffer_page(struct gfs2_inode *ip, struct buffer_head *dibh, memcpy(kaddr, dibh->b_data + sizeof(struct gfs2_dinode), dsize); memset(kaddr + dsize, 0, PAGE_SIZE - dsize); kunmap(page); - - SetPageUptodate(page); } if (gfs2_is_jdata(ip)) { struct buffer_head *bh; + SetPageUptodate(page); if (!page_has_buffers(page)) create_empty_buffers(page, BIT(inode->i_blkbits), BIT(BH_Uptodate)); @@ -93,6 +92,9 @@ static int gfs2_unstuffer_page(struct gfs2_inode *ip, struct buffer_head *dibh, set_buffer_uptodate(bh); gfs2_trans_add_data(ip->i_gl, bh); } else { + iomap_page_create(inode, page); + iomap_set_range_uptodate(page, 0, i_blocksize(inode)); + set_page_dirty(page); gfs2_ordered_add_inode(ip); } diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c index 9d58295ccf7a..9af352ebc904 100644 --- a/fs/gfs2/file.c +++ b/fs/gfs2/file.c @@ -555,6 +555,8 @@ static vm_fault_t gfs2_page_mkwrite(struct vm_fault *vmf) out_uninit: gfs2_holder_uninit(&gh); if (ret == 0) { + if (!gfs2_is_jdata(ip)) + iomap_page_create(inode, page); set_page_dirty(page); wait_for_stable_page(page); } -- 2.20.1