diff options
| author |   Christoph Hellwig <hch@lst.de> | 2019-07-01 23:54:34 +0200 |
|---|---|---|
| committer |   Andreas Gruenbacher <agruenba@redhat.com> | 2019-07-03 14:45:18 +0200 |
| commit | 59c01c5046cc0cf567d58cc7b59a704a36a06899 (patch) | |
| tree | 843ebf4ac49cef1d4658f9aca7a5428150eb87ff /fs/gfs2 | |
| parent | gfs2: merge gfs2_writeback_aops and gfs2_ordered_aops (diff) | |
| download | linux-dev-59c01c5046cc0cf567d58cc7b59a704a36a06899.tar.xz linux-dev-59c01c5046cc0cf567d58cc7b59a704a36a06899.zip | |
gfs2: merge gfs2_writepage_common into gfs2_writepage
There is no need to keep these two functions separate.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Diffstat (limited to 'fs/gfs2')
| -rw-r--r-- | fs/gfs2/aops.c | 32 |
1 files changed, 6 insertions, 26 deletions
diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c index 210e4a8d4e7b..4edf917752af 100644 --- a/fs/gfs2/aops.c +++ b/fs/gfs2/aops.c @@ -82,15 +82,11 @@ static int gfs2_get_block_noalloc(struct inode *inode, sector_t lblock, } /** - * gfs2_writepage_common - Common bits of writepage - * @page: The page to be written + * gfs2_writepage - Write page for writeback mappings + * @page: The page * @wbc: The writeback control - * - * Returns: 1 if writepage is ok, otherwise an error code or zero if no error. */ - -static int gfs2_writepage_common(struct page *page, - struct writeback_control *wbc) +static int gfs2_writepage(struct page *page, struct writeback_control *wbc) { struct inode *inode = page->mapping->host; struct gfs2_inode *ip = GFS2_I(inode); @@ -109,7 +105,9 @@ static int gfs2_writepage_common(struct page *page, page->mapping->a_ops->invalidatepage(page, 0, PAGE_SIZE); goto out; } - return 1; + + return nobh_writepage(page, gfs2_get_block_noalloc, wbc); + redirty: redirty_page_for_writepage(wbc, page); out: @@ -117,24 +115,6 @@ out: return 0; } -/** - * gfs2_writepage - Write page for writeback mappings - * @page: The page - * @wbc: The writeback control - * - */ - -static int gfs2_writepage(struct page *page, struct writeback_control *wbc) -{ - int ret; - - ret = gfs2_writepage_common(page, wbc); - if (ret <= 0) - return ret; - - return nobh_writepage(page, gfs2_get_block_noalloc, wbc); -} - /* This is the same as calling block_write_full_page, but it also * writes pages outside of i_size */ |