Return-Path: Received: from mail-pz0-f42.google.com ([209.85.210.42]:56600 "EHLO mail-pz0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751939Ab1HJPiZ (ORCPT ); Wed, 10 Aug 2011 11:38:25 -0400 Received: by pzk37 with SMTP id 37so2033196pzk.1 for ; Wed, 10 Aug 2011 08:38:25 -0700 (PDT) From: Peng Tao To: Benny Halevy Cc: linux-nfs@vger.kernel.org, Peng Tao Subject: [PATCH 1/5] pNFS: recoalesce when ld write pagelist fails Date: Sat, 6 Aug 2011 19:53:51 -0700 Message-Id: <1312685635-1593-1-git-send-email-bergwolf@gmail.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: Content-Type: text/plain MIME-Version: 1.0 For pnfs pagelist write failure, we need to pg_recoalesce and resend IO to mds. Signed-off-by: Peng Tao --- fs/nfs/internal.h | 4 ++++ fs/nfs/pnfs.c | 35 ++++++++++++++++++++++++++++++++--- fs/nfs/write.c | 21 ++++++++++++++------- 3 files changed, 50 insertions(+), 10 deletions(-) diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index ab12913..62f183d 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -305,6 +305,10 @@ extern void nfs_readdata_release(struct nfs_read_data *rdata); /* write.c */ extern int nfs_generic_flush(struct nfs_pageio_descriptor *desc, struct list_head *head); +extern int do_nfs_writepage(struct page *page, struct writeback_control *wbc, + struct nfs_pageio_descriptor *pgio); +extern void nfs_pageio_init_write_mds(struct nfs_pageio_descriptor *pgio, + struct inode *inode, int ioflags); extern void nfs_pageio_reset_write_mds(struct nfs_pageio_descriptor *pgio); extern void nfs_writedata_release(struct nfs_write_data *wdata); extern void nfs_commit_free(struct nfs_write_data *p); diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index e550e88..08aba45 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1172,6 +1172,13 @@ int pnfs_ld_write_done(struct nfs_write_data *data) { int status; + struct nfs_pageio_descriptor pgio; + struct writeback_control wbc = { + .sync_mode = WB_SYNC_ALL, + .range_start = data->mds_offset, + .nr_to_write = data->npages, + .range_end = LLONG_MAX, + }; if (!data->pnfs_error) { pnfs_set_layoutcommit(data); @@ -1180,11 +1187,33 @@ pnfs_ld_write_done(struct nfs_write_data *data) return 0; } + put_lseg(data->lseg); + data->lseg = NULL; dprintk("%s: pnfs_error=%d, retry via MDS\n", __func__, data->pnfs_error); - status = nfs_initiate_write(data, NFS_CLIENT(data->inode), - data->mds_ops, NFS_FILE_SYNC); - return status ? : -EAGAIN; + nfs_pageio_init_write_mds(&pgio, data->inode, FLUSH_STABLE); + pgio.pg_recoalesce = 1; + while (!list_empty(&data->pages)) { + struct nfs_page *req = nfs_list_entry(data->pages.next); + struct page *page = req->wb_page; + + nfs_list_remove_request(req); + nfs_clear_page_tag_locked(req); + + end_page_writeback(page); + + lock_page(page); + status = do_nfs_writepage(page, &wbc, &pgio); + if (status) { + /* FIXME: is this enough?? */ + set_page_dirty(page); + } + unlock_page(page); + } + nfs_pageio_complete(&pgio); + nfs_writedata_release(data); + + return 0; } EXPORT_SYMBOL_GPL(pnfs_ld_write_done); diff --git a/fs/nfs/write.c b/fs/nfs/write.c index b39b37f..0ccdf98 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -285,14 +285,9 @@ out: return ret; } -static int nfs_do_writepage(struct page *page, struct writeback_control *wbc, struct nfs_pageio_descriptor *pgio) +int do_nfs_writepage(struct page *page, struct writeback_control *wbc, struct nfs_pageio_descriptor *pgio) { - struct inode *inode = page->mapping->host; int ret; - - nfs_inc_stats(inode, NFSIOS_VFSWRITEPAGE); - nfs_add_stats(inode, NFSIOS_WRITEPAGES, 1); - nfs_pageio_cond_complete(pgio, page->index); ret = nfs_page_async_flush(pgio, page, wbc->sync_mode == WB_SYNC_NONE); if (ret == -EAGAIN) { @@ -301,6 +296,17 @@ static int nfs_do_writepage(struct page *page, struct writeback_control *wbc, st } return ret; } +EXPORT_SYMBOL_GPL(do_nfs_writepage); + +static int nfs_do_writepage(struct page *page, struct writeback_control *wbc, struct nfs_pageio_descriptor *pgio) +{ + struct inode *inode = page->mapping->host; + + nfs_inc_stats(inode, NFSIOS_VFSWRITEPAGE); + nfs_add_stats(inode, NFSIOS_WRITEPAGES, 1); + + return do_nfs_writepage(page, wbc, pgio); +} /* * Write an mmapped page to the server. @@ -1051,12 +1057,13 @@ static const struct nfs_pageio_ops nfs_pageio_write_ops = { .pg_doio = nfs_generic_pg_writepages, }; -static void nfs_pageio_init_write_mds(struct nfs_pageio_descriptor *pgio, +void nfs_pageio_init_write_mds(struct nfs_pageio_descriptor *pgio, struct inode *inode, int ioflags) { nfs_pageio_init(pgio, inode, &nfs_pageio_write_ops, NFS_SERVER(inode)->wsize, ioflags); } +EXPORT_SYMBOL_GPL(nfs_pageio_init_write_mds); void nfs_pageio_reset_write_mds(struct nfs_pageio_descriptor *pgio) { -- 1.7.1.262.g5ef3d