Skip to content

Commit 529a781

Browse files
zhangyi089tytso
authored andcommitted
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 <536fc240e7147> ("jbd2: clean up jbd2_journal_try_to_free_buffers()"), so just remove it. Signed-off-by: zhangyi (F) <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Theodore Ts'o <[email protected]>
1 parent c044f3d commit 529a781

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

fs/ext4/inode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3288,7 +3288,7 @@ static int ext4_releasepage(struct page *page, gfp_t wait)
32883288
if (PageChecked(page))
32893289
return 0;
32903290
if (journal)
3291-
return jbd2_journal_try_to_free_buffers(journal, page, wait);
3291+
return jbd2_journal_try_to_free_buffers(journal, page);
32923292
else
32933293
return try_to_free_buffers(page);
32943294
}

fs/ext4/super.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1288,8 +1288,8 @@ static int bdev_try_to_free_page(struct super_block *sb, struct page *page,
12881288
if (!page_has_buffers(page))
12891289
return 0;
12901290
if (journal)
1291-
return jbd2_journal_try_to_free_buffers(journal, page,
1292-
wait & ~__GFP_DIRECT_RECLAIM);
1291+
return jbd2_journal_try_to_free_buffers(journal, page);
1292+
12931293
return try_to_free_buffers(page);
12941294
}
12951295

fs/jbd2/transaction.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2081,10 +2081,6 @@ __journal_try_to_free_buffer(journal_t *journal, struct buffer_head *bh)
20812081
* int jbd2_journal_try_to_free_buffers() - try to free page buffers.
20822082
* @journal: journal for operation
20832083
* @page: to try and free
2084-
* @gfp_mask: we use the mask to detect how hard should we try to release
2085-
* buffers. If __GFP_DIRECT_RECLAIM and __GFP_FS is set, we wait for commit
2086-
* code to release the buffers.
2087-
*
20882084
*
20892085
* For all the buffers on this page,
20902086
* 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)
21152111
*
21162112
* Return 0 on failure, 1 on success
21172113
*/
2118-
int jbd2_journal_try_to_free_buffers(journal_t *journal,
2119-
struct page *page, gfp_t gfp_mask)
2114+
int jbd2_journal_try_to_free_buffers(journal_t *journal, struct page *page)
21202115
{
21212116
struct buffer_head *head;
21222117
struct buffer_head *bh;

include/linux/jbd2.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1380,7 +1380,7 @@ extern int jbd2_journal_dirty_metadata (handle_t *, struct buffer_head *);
13801380
extern int jbd2_journal_forget (handle_t *, struct buffer_head *);
13811381
extern int jbd2_journal_invalidatepage(journal_t *,
13821382
struct page *, unsigned int, unsigned int);
1383-
extern int jbd2_journal_try_to_free_buffers(journal_t *, struct page *, gfp_t);
1383+
extern int jbd2_journal_try_to_free_buffers(journal_t *journal, struct page *page);
13841384
extern int jbd2_journal_stop(handle_t *);
13851385
extern int jbd2_journal_flush (journal_t *);
13861386
extern void jbd2_journal_lock_updates (journal_t *);

0 commit comments

Comments
 (0)