btrfs: merge two flush_write_bio helpers

kdave · kdave · commit e2932ee08e46 · 2018-01-22T16:08:18.000+01:00
flush_epd_write_bio is same as flush_write_bio, no point having two such
functions. Merge them to flush_write_bio. The 'noinline' attribute is
removed as it does not have any meaning.

Signed-off-by: David Sterba &lt;dsterba@suse.com&gt;
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
@@ -138,7 +138,8 @@ static void add_extent_changeset(struct extent_state *state, unsigned bits,
 	BUG_ON(ret < 0);
 }
 
-static noinline void flush_write_bio(void *data);
+static void flush_write_bio(void *data);
+
 static inline struct btrfs_fs_info *
 tree_fs_info(struct extent_io_tree *tree)
 {
@@ -4039,8 +4040,10 @@ static int extent_write_cache_pages(struct address_space *mapping,
 	return ret;
 }
 
-static void flush_epd_write_bio(struct extent_page_data *epd)
+static void flush_write_bio(void *data)
 {
+	struct extent_page_data *epd = data;
+
 	if (epd->bio) {
 		int ret;
 
@@ -4050,12 +4053,6 @@ static void flush_epd_write_bio(struct extent_page_data *epd)
 	}
 }
 
-static noinline void flush_write_bio(void *data)
-{
-	struct extent_page_data *epd = data;
-	flush_epd_write_bio(epd);
-}
-
 int extent_write_full_page(struct page *page, struct writeback_control *wbc)
 {
 	int ret;
@@ -4068,7 +4065,7 @@ int extent_write_full_page(struct page *page, struct writeback_control *wbc)
 
 	ret = __extent_writepage(page, wbc, &epd);
 
-	flush_epd_write_bio(&epd);
+	flush_write_bio(&epd);
 	return ret;
 }
 
@@ -4110,7 +4107,7 @@ int extent_write_locked_range(struct inode *inode, u64 start, u64 end,
 		start += PAGE_SIZE;
 	}
 
-	flush_epd_write_bio(&epd);
+	flush_write_bio(&epd);
 	return ret;
 }
 
@@ -4128,7 +4125,7 @@ int extent_writepages(struct extent_io_tree *tree,
 
 	ret = extent_write_cache_pages(mapping, wbc, __extent_writepage, &epd,
 				       flush_write_bio);
-	flush_epd_write_bio(&epd);
+	flush_write_bio(&epd);
 	return ret;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,8 @@ static void add_extent_changeset(struct extent_state *state, unsigned bits,`
`138`	`138`	`BUG_ON(ret < 0);`
`139`	`139`	`}`
`140`	`140`
`141`		`-static noinline void flush_write_bio(void *data);`
	`141`	`+static void flush_write_bio(void *data);`
	`142`	`+`
`142`	`143`	`static inline struct btrfs_fs_info *`
`143`	`144`	`tree_fs_info(struct extent_io_tree *tree)`
`144`	`145`	`{`
`@@ -4039,8 +4040,10 @@ static int extent_write_cache_pages(struct address_space *mapping,`
`4039`	`4040`	`return ret;`
`4040`	`4041`	`}`
`4041`	`4042`
`4042`		`-static void flush_epd_write_bio(struct extent_page_data *epd)`
	`4043`	`+static void flush_write_bio(void *data)`
`4043`	`4044`	`{`
	`4045`	`+ struct extent_page_data *epd = data;`
	`4046`	`+`
`4044`	`4047`	`if (epd->bio) {`
`4045`	`4048`	`int ret;`
`4046`	`4049`
`@@ -4050,12 +4053,6 @@ static void flush_epd_write_bio(struct extent_page_data *epd)`
`4050`	`4053`	`}`
`4051`	`4054`	`}`
`4052`	`4055`
`4053`		`-static noinline void flush_write_bio(void *data)`
`4054`		`-{`
`4055`		`- struct extent_page_data *epd = data;`
`4056`		`- flush_epd_write_bio(epd);`
`4057`		`-}`
`4058`		`-`
`4059`	`4056`	`int extent_write_full_page(struct page page, struct writeback_control wbc)`
`4060`	`4057`	`{`
`4061`	`4058`	`int ret;`
`@@ -4068,7 +4065,7 @@ int extent_write_full_page(struct page page, struct writeback_control wbc)`
`4068`	`4065`
`4069`	`4066`	`ret = __extent_writepage(page, wbc, &epd);`
`4070`	`4067`
`4071`		`- flush_epd_write_bio(&epd);`
	`4068`	`+ flush_write_bio(&epd);`
`4072`	`4069`	`return ret;`
`4073`	`4070`	`}`
`4074`	`4071`
`@@ -4110,7 +4107,7 @@ int extent_write_locked_range(struct inode *inode, u64 start, u64 end,`
`4110`	`4107`	`start += PAGE_SIZE;`
`4111`	`4108`	`}`
`4112`	`4109`
`4113`		`- flush_epd_write_bio(&epd);`
	`4110`	`+ flush_write_bio(&epd);`
`4114`	`4111`	`return ret;`
`4115`	`4112`	`}`
`4116`	`4113`
`@@ -4128,7 +4125,7 @@ int extent_writepages(struct extent_io_tree *tree,`
`4128`	`4125`
`4129`	`4126`	`ret = extent_write_cache_pages(mapping, wbc, __extent_writepage, &epd,`
`4130`	`4127`	`flush_write_bio);`
`4131`		`- flush_epd_write_bio(&epd);`
	`4128`	`+ flush_write_bio(&epd);`
`4132`	`4129`	`return ret;`
`4133`	`4130`	`}`
`4134`	`4131`