korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 21:38:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

NFS: Clean up nfs_writepages()

Browse Source 
Just call write_cache_pages directly instead of hacking the writeback
control structure in order to find out if we were called from writepages()
or directly from the VM.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2007-07-22 19:27:32 -04:00
parent 9cccef9505
commit f758c88519
1 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
fs/nfs/write.c
View File

@ -292,41 +292,51 @@ static int nfs_page_async_flush(struct nfs_pageio_descriptor *pgio,
return 0; return 0;
} }
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);
nfs_pageio_cond_complete(pgio, page->index);
return nfs_page_async_flush(pgio, page);
}
/* /*
* Write an mmapped page to the server. * Write an mmapped page to the server.
*/ */
static int nfs_writepage_locked(struct page *page, struct writeback_control *wbc) static int nfs_writepage_locked(struct page *page, struct writeback_control *wbc)
{ {
struct nfs_pageio_descriptor mypgio, *pgio; struct nfs_pageio_descriptor pgio;
struct inode *inode = page->mapping->host;
int err; int err;
nfs_inc_stats(inode, NFSIOS_VFSWRITEPAGE); nfs_pageio_init_write(&pgio, page->mapping->host, wb_priority(wbc));
nfs_add_stats(inode, NFSIOS_WRITEPAGES, 1); err = nfs_do_writepage(page, wbc, &pgio);
nfs_pageio_complete(&pgio);
if (wbc->for_writepages) if (err < 0)
pgio = wbc->fs_private; return err;
else { if (pgio.pg_error < 0)
nfs_pageio_init_write(&mypgio, inode, wb_priority(wbc)); return pgio.pg_error;
pgio = &mypgio; return 0;
}
nfs_pageio_cond_complete(pgio, page->index);
err = nfs_page_async_flush(pgio, page);
if (!wbc->for_writepages)
nfs_pageio_complete(pgio);
return err;
} }
int nfs_writepage(struct page *page, struct writeback_control *wbc) int nfs_writepage(struct page *page, struct writeback_control *wbc)
{ {
int err; int ret;
err = nfs_writepage_locked(page, wbc); ret = nfs_writepage_locked(page, wbc);
unlock_page(page); unlock_page(page);
return err; return ret;
}
static int nfs_writepages_callback(struct page *page, struct writeback_control *wbc, void *data)
{
int ret;
ret = nfs_do_writepage(page, wbc, data);
unlock_page(page);
return ret;
} }
int nfs_writepages(struct address_space *mapping, struct writeback_control *wbc) int nfs_writepages(struct address_space *mapping, struct writeback_control *wbc)
@ -338,12 +348,11 @@ int nfs_writepages(struct address_space *mapping, struct writeback_control *wbc)
nfs_inc_stats(inode, NFSIOS_VFSWRITEPAGES); nfs_inc_stats(inode, NFSIOS_VFSWRITEPAGES);
nfs_pageio_init_write(&pgio, inode, wb_priority(wbc)); nfs_pageio_init_write(&pgio, inode, wb_priority(wbc));
wbc->fs_private = &pgio; err = write_cache_pages(mapping, wbc, nfs_writepages_callback, &pgio);
err = generic_writepages(mapping, wbc);
nfs_pageio_complete(&pgio); nfs_pageio_complete(&pgio);
if (err) if (err < 0)
return err; return err;
if (pgio.pg_error) if (pgio.pg_error < 0)
return pgio.pg_error; return pgio.pg_error;
return 0; return 0;
} }