Commit 529a781e authored by zhangyi (F)'s avatar zhangyi (F) Committed by Theodore Ts'o

jbd2: remove unused parameter in jbd2_journal_try_to_free_buffers()

Parameter gfp_mask in jbd2_journal_try_to_free_buffers() is no longer
used after commit <536fc240> ("jbd2: clean up
jbd2_journal_try_to_free_buffers()"), so just remove it.
Signed-off-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Link: https://lore.kernel.org/r/20200620025427.1756360-6-yi.zhang@huawei.comSigned-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent c044f3d8
...@@ -3288,7 +3288,7 @@ static int ext4_releasepage(struct page *page, gfp_t wait) ...@@ -3288,7 +3288,7 @@ static int ext4_releasepage(struct page *page, gfp_t wait)
if (PageChecked(page)) if (PageChecked(page))
return 0; return 0;
if (journal) if (journal)
return jbd2_journal_try_to_free_buffers(journal, page, wait); return jbd2_journal_try_to_free_buffers(journal, page);
else else
return try_to_free_buffers(page); return try_to_free_buffers(page);
} }
......
...@@ -1288,8 +1288,8 @@ static int bdev_try_to_free_page(struct super_block *sb, struct page *page, ...@@ -1288,8 +1288,8 @@ static int bdev_try_to_free_page(struct super_block *sb, struct page *page,
if (!page_has_buffers(page)) if (!page_has_buffers(page))
return 0; return 0;
if (journal) if (journal)
return jbd2_journal_try_to_free_buffers(journal, page, return jbd2_journal_try_to_free_buffers(journal, page);
wait & ~__GFP_DIRECT_RECLAIM);
return try_to_free_buffers(page); return try_to_free_buffers(page);
} }
......
...@@ -2081,10 +2081,6 @@ __journal_try_to_free_buffer(journal_t *journal, struct buffer_head *bh) ...@@ -2081,10 +2081,6 @@ __journal_try_to_free_buffer(journal_t *journal, struct buffer_head *bh)
* int jbd2_journal_try_to_free_buffers() - try to free page buffers. * int jbd2_journal_try_to_free_buffers() - try to free page buffers.
* @journal: journal for operation * @journal: journal for operation
* @page: to try and free * @page: to try and free
* @gfp_mask: we use the mask to detect how hard should we try to release
* buffers. If __GFP_DIRECT_RECLAIM and __GFP_FS is set, we wait for commit
* code to release the buffers.
*
* *
* For all the buffers on this page, * For all the buffers on this page,
* if they are fully written out ordered data, move them onto BUF_CLEAN * if they are fully written out ordered data, move them onto BUF_CLEAN
...@@ -2115,8 +2111,7 @@ __journal_try_to_free_buffer(journal_t *journal, struct buffer_head *bh) ...@@ -2115,8 +2111,7 @@ __journal_try_to_free_buffer(journal_t *journal, struct buffer_head *bh)
* *
* Return 0 on failure, 1 on success * Return 0 on failure, 1 on success
*/ */
int jbd2_journal_try_to_free_buffers(journal_t *journal, int jbd2_journal_try_to_free_buffers(journal_t *journal, struct page *page)
struct page *page, gfp_t gfp_mask)
{ {
struct buffer_head *head; struct buffer_head *head;
struct buffer_head *bh; struct buffer_head *bh;
......
...@@ -1380,7 +1380,7 @@ extern int jbd2_journal_dirty_metadata (handle_t *, struct buffer_head *); ...@@ -1380,7 +1380,7 @@ extern int jbd2_journal_dirty_metadata (handle_t *, struct buffer_head *);
extern int jbd2_journal_forget (handle_t *, struct buffer_head *); extern int jbd2_journal_forget (handle_t *, struct buffer_head *);
extern int jbd2_journal_invalidatepage(journal_t *, extern int jbd2_journal_invalidatepage(journal_t *,
struct page *, unsigned int, unsigned int); struct page *, unsigned int, unsigned int);
extern int jbd2_journal_try_to_free_buffers(journal_t *, struct page *, gfp_t); extern int jbd2_journal_try_to_free_buffers(journal_t *journal, struct page *page);
extern int jbd2_journal_stop(handle_t *); extern int jbd2_journal_stop(handle_t *);
extern int jbd2_journal_flush (journal_t *); extern int jbd2_journal_flush (journal_t *);
extern void jbd2_journal_lock_updates (journal_t *); extern void jbd2_journal_lock_updates (journal_t *);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment