diff options
Diffstat (limited to 'fs/jbd2')
-rw-r--r-- | fs/jbd2/transaction.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index cb56fe9aaabb..b01fd6104089 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c | |||
@@ -115,7 +115,7 @@ static inline void update_t_max_wait(transaction_t *transaction, | |||
115 | */ | 115 | */ |
116 | 116 | ||
117 | static int start_this_handle(journal_t *journal, handle_t *handle, | 117 | static int start_this_handle(journal_t *journal, handle_t *handle, |
118 | int gfp_mask) | 118 | gfp_t gfp_mask) |
119 | { | 119 | { |
120 | transaction_t *transaction, *new_transaction = NULL; | 120 | transaction_t *transaction, *new_transaction = NULL; |
121 | tid_t tid; | 121 | tid_t tid; |
@@ -320,7 +320,7 @@ static handle_t *new_handle(int nblocks) | |||
320 | * Return a pointer to a newly allocated handle, or an ERR_PTR() value | 320 | * Return a pointer to a newly allocated handle, or an ERR_PTR() value |
321 | * on failure. | 321 | * on failure. |
322 | */ | 322 | */ |
323 | handle_t *jbd2__journal_start(journal_t *journal, int nblocks, int gfp_mask) | 323 | handle_t *jbd2__journal_start(journal_t *journal, int nblocks, gfp_t gfp_mask) |
324 | { | 324 | { |
325 | handle_t *handle = journal_current_handle(); | 325 | handle_t *handle = journal_current_handle(); |
326 | int err; | 326 | int err; |
@@ -443,7 +443,7 @@ out: | |||
443 | * transaction capabable of guaranteeing the requested number of | 443 | * transaction capabable of guaranteeing the requested number of |
444 | * credits. | 444 | * credits. |
445 | */ | 445 | */ |
446 | int jbd2__journal_restart(handle_t *handle, int nblocks, int gfp_mask) | 446 | int jbd2__journal_restart(handle_t *handle, int nblocks, gfp_t gfp_mask) |
447 | { | 447 | { |
448 | transaction_t *transaction = handle->h_transaction; | 448 | transaction_t *transaction = handle->h_transaction; |
449 | journal_t *journal = transaction->t_journal; | 449 | journal_t *journal = transaction->t_journal; |