From: Christoph Hellwig <hch@lst.de> To: Andreas Gruenbacher <agruenba@redhat.com> Cc: "Darrick J . Wong" <darrick.wong@oracle.com>, linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, cluster-devel@redhat.com Subject: [PATCH 09/15] gfs2: merge gfs2_writeback_aops and gfs2_ordered_aops Date: Mon, 1 Jul 2019 23:54:33 +0200 [thread overview] Message-ID: <20190701215439.19162-10-hch@lst.de> (raw) In-Reply-To: <20190701215439.19162-1-hch@lst.de> The only difference between the two is that gfs2_ordered_aops sets the set_page_dirty method to __set_page_dirty_buffers, but given that __set_page_dirty_buffers is the default if no method is set there is no need to to do that. Merge the two sets of operations into one. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/gfs2/aops.c | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c index 3c58b40c93eb..3b3043332e5a 100644 --- a/fs/gfs2/aops.c +++ b/fs/gfs2/aops.c @@ -847,7 +847,7 @@ int gfs2_releasepage(struct page *page, gfp_t gfp_mask) return 0; } -static const struct address_space_operations gfs2_writeback_aops = { +static const struct address_space_operations gfs2_aops = { .writepage = gfs2_writepage, .writepages = gfs2_writepages, .readpage = gfs2_readpage, @@ -861,21 +861,6 @@ static const struct address_space_operations gfs2_writeback_aops = { .error_remove_page = generic_error_remove_page, }; -static const struct address_space_operations gfs2_ordered_aops = { - .writepage = gfs2_writepage, - .writepages = gfs2_writepages, - .readpage = gfs2_readpage, - .readpages = gfs2_readpages, - .set_page_dirty = __set_page_dirty_buffers, - .bmap = gfs2_bmap, - .invalidatepage = gfs2_invalidatepage, - .releasepage = gfs2_releasepage, - .direct_IO = noop_direct_IO, - .migratepage = buffer_migrate_page, - .is_partially_uptodate = block_is_partially_uptodate, - .error_remove_page = generic_error_remove_page, -}; - static const struct address_space_operations gfs2_jdata_aops = { .writepage = gfs2_jdata_writepage, .writepages = gfs2_jdata_writepages, @@ -891,15 +876,8 @@ static const struct address_space_operations gfs2_jdata_aops = { void gfs2_set_aops(struct inode *inode) { - struct gfs2_inode *ip = GFS2_I(inode); - struct gfs2_sbd *sdp = GFS2_SB(inode); - - if (gfs2_is_jdata(ip)) + if (gfs2_is_jdata(GFS2_I(inode))) inode->i_mapping->a_ops = &gfs2_jdata_aops; - else if (gfs2_is_writeback(sdp)) - inode->i_mapping->a_ops = &gfs2_writeback_aops; - else if (gfs2_is_ordered(sdp)) - inode->i_mapping->a_ops = &gfs2_ordered_aops; else - BUG(); + inode->i_mapping->a_ops = &gfs2_aops; } -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de> To: cluster-devel.redhat.com Subject: [Cluster-devel] [PATCH 09/15] gfs2: merge gfs2_writeback_aops and gfs2_ordered_aops Date: Mon, 1 Jul 2019 23:54:33 +0200 [thread overview] Message-ID: <20190701215439.19162-10-hch@lst.de> (raw) In-Reply-To: <20190701215439.19162-1-hch@lst.de> The only difference between the two is that gfs2_ordered_aops sets the set_page_dirty method to __set_page_dirty_buffers, but given that __set_page_dirty_buffers is the default if no method is set there is no need to to do that. Merge the two sets of operations into one. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/gfs2/aops.c | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c index 3c58b40c93eb..3b3043332e5a 100644 --- a/fs/gfs2/aops.c +++ b/fs/gfs2/aops.c @@ -847,7 +847,7 @@ int gfs2_releasepage(struct page *page, gfp_t gfp_mask) return 0; } -static const struct address_space_operations gfs2_writeback_aops = { +static const struct address_space_operations gfs2_aops = { .writepage = gfs2_writepage, .writepages = gfs2_writepages, .readpage = gfs2_readpage, @@ -861,21 +861,6 @@ static const struct address_space_operations gfs2_writeback_aops = { .error_remove_page = generic_error_remove_page, }; -static const struct address_space_operations gfs2_ordered_aops = { - .writepage = gfs2_writepage, - .writepages = gfs2_writepages, - .readpage = gfs2_readpage, - .readpages = gfs2_readpages, - .set_page_dirty = __set_page_dirty_buffers, - .bmap = gfs2_bmap, - .invalidatepage = gfs2_invalidatepage, - .releasepage = gfs2_releasepage, - .direct_IO = noop_direct_IO, - .migratepage = buffer_migrate_page, - .is_partially_uptodate = block_is_partially_uptodate, - .error_remove_page = generic_error_remove_page, -}; - static const struct address_space_operations gfs2_jdata_aops = { .writepage = gfs2_jdata_writepage, .writepages = gfs2_jdata_writepages, @@ -891,15 +876,8 @@ static const struct address_space_operations gfs2_jdata_aops = { void gfs2_set_aops(struct inode *inode) { - struct gfs2_inode *ip = GFS2_I(inode); - struct gfs2_sbd *sdp = GFS2_SB(inode); - - if (gfs2_is_jdata(ip)) + if (gfs2_is_jdata(GFS2_I(inode))) inode->i_mapping->a_ops = &gfs2_jdata_aops; - else if (gfs2_is_writeback(sdp)) - inode->i_mapping->a_ops = &gfs2_writeback_aops; - else if (gfs2_is_ordered(sdp)) - inode->i_mapping->a_ops = &gfs2_ordered_aops; else - BUG(); + inode->i_mapping->a_ops = &gfs2_aops; } -- 2.20.1
next prev parent reply other threads:[~2019-07-01 21:56 UTC|newest] Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-01 21:54 RFC: use the iomap writepage path in gfs2 Christoph Hellwig 2019-07-01 21:54 ` [Cluster-devel] " Christoph Hellwig 2019-07-01 21:54 ` [PATCH 01/15] FOLD: iomap: make the discard_page method optional Christoph Hellwig 2019-07-01 21:54 ` [Cluster-devel] " Christoph Hellwig 2019-07-01 21:54 ` [PATCH 02/15] FOLD: iomap: make ->submit_ioend optional Christoph Hellwig 2019-07-01 21:54 ` [Cluster-devel] " Christoph Hellwig 2019-07-01 21:54 ` [PATCH 03/15] iomap: zero newly allocated mapped blocks Christoph Hellwig 2019-07-01 21:54 ` [Cluster-devel] " Christoph Hellwig 2019-07-01 21:54 ` [PATCH 04/15] iomap: warn on inline maps iomap_writepage_map Christoph Hellwig 2019-07-01 21:54 ` [Cluster-devel] " Christoph Hellwig 2019-07-01 21:54 ` [PATCH 05/15] iomap: move struct iomap_page to iomap.c Christoph Hellwig 2019-07-01 21:54 ` [Cluster-devel] " Christoph Hellwig 2019-07-01 21:54 ` [PATCH 06/15] HACK: disable lockdep annotation in iomap_dio_rw Christoph Hellwig 2019-07-01 21:54 ` [Cluster-devel] " Christoph Hellwig 2019-07-01 21:54 ` [PATCH 07/15] gfs2: use page_offset in gfs2_page_mkwrite Christoph Hellwig 2019-07-01 21:54 ` [Cluster-devel] " Christoph Hellwig 2019-07-01 21:54 ` [PATCH 08/15] gfs2: remove the unused gfs2_stuffed_write_end function Christoph Hellwig 2019-07-01 21:54 ` [Cluster-devel] " Christoph Hellwig 2019-07-01 21:54 ` Christoph Hellwig [this message] 2019-07-01 21:54 ` [Cluster-devel] [PATCH 09/15] gfs2: merge gfs2_writeback_aops and gfs2_ordered_aops Christoph Hellwig 2019-07-01 21:54 ` [PATCH 10/15] gfs2: merge gfs2_writepage_common into gfs2_writepage Christoph Hellwig 2019-07-01 21:54 ` [Cluster-devel] " Christoph Hellwig 2019-07-01 21:54 ` [PATCH 11/15] gfs2: mark stuffed_readpage static Christoph Hellwig 2019-07-01 21:54 ` [Cluster-devel] " Christoph Hellwig 2019-07-01 21:54 ` [PATCH 12/15] gfs2: use iomap_bmap instead of generic_block_bmap Christoph Hellwig 2019-07-01 21:54 ` [Cluster-devel] " Christoph Hellwig 2019-07-01 21:54 ` [PATCH 13/15] gfs2: implement gfs2_block_zero_range using iomap_zero_range Christoph Hellwig 2019-07-01 21:54 ` [Cluster-devel] " Christoph Hellwig 2019-07-01 21:54 ` [PATCH 14/15] gfs2: don't use buffer_heads in gfs2_allocate_page_backing Christoph Hellwig 2019-07-01 21:54 ` [Cluster-devel] " Christoph Hellwig 2019-07-01 21:54 ` [PATCH 15/15] gfs2: use iomap for buffered I/O in ordered and writeback mode Christoph Hellwig 2019-07-01 21:54 ` [Cluster-devel] " Christoph Hellwig 2019-08-05 12:27 ` Andreas Gruenbacher 2019-08-05 12:27 ` [Cluster-devel] " Andreas Gruenbacher 2019-08-06 5:30 ` Christoph Hellwig 2019-08-06 5:30 ` [Cluster-devel] " Christoph Hellwig 2019-09-30 20:49 ` Andreas Gruenbacher 2019-09-30 20:49 ` [Cluster-devel] " Andreas Gruenbacher 2019-07-03 22:35 ` RFC: use the iomap writepage path in gfs2 Andreas Gruenbacher 2019-07-03 22:35 ` [Cluster-devel] " Andreas Gruenbacher 2019-07-08 16:03 ` Christoph Hellwig 2019-07-08 16:03 ` [Cluster-devel] " Christoph Hellwig 2019-07-08 17:29 ` Andreas Gruenbacher 2019-07-08 17:29 ` [Cluster-devel] " Andreas Gruenbacher 2019-07-08 0:01 ` Dave Chinner 2019-07-08 0:01 ` [Cluster-devel] " Dave Chinner 2019-07-08 16:19 ` Christoph Hellwig 2019-07-08 16:19 ` [Cluster-devel] " Christoph Hellwig
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190701215439.19162-10-hch@lst.de \ --to=hch@lst.de \ --cc=agruenba@redhat.com \ --cc=cluster-devel@redhat.com \ --cc=darrick.wong@oracle.com \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-xfs@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.