jbd2: use gfp_t instead of int
This silences some Sparse warnings: fs/jbd2/transaction.c:135:69: warning: incorrect type in argument 2 (different base types) fs/jbd2/transaction.c:135:69: expected restricted gfp_t [usertype] flags fs/jbd2/transaction.c:135:69: got int [signed] gfp_mask Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
parent
9ea7a0df63
commit
d2159fb7b8
|
@ -115,7 +115,7 @@ static inline void update_t_max_wait(transaction_t *transaction,
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static int start_this_handle(journal_t *journal, handle_t *handle,
|
static int start_this_handle(journal_t *journal, handle_t *handle,
|
||||||
int gfp_mask)
|
gfp_t gfp_mask)
|
||||||
{
|
{
|
||||||
transaction_t *transaction, *new_transaction = NULL;
|
transaction_t *transaction, *new_transaction = NULL;
|
||||||
tid_t tid;
|
tid_t tid;
|
||||||
|
@ -320,7 +320,7 @@ static handle_t *new_handle(int nblocks)
|
||||||
* Return a pointer to a newly allocated handle, or an ERR_PTR() value
|
* Return a pointer to a newly allocated handle, or an ERR_PTR() value
|
||||||
* on failure.
|
* on failure.
|
||||||
*/
|
*/
|
||||||
handle_t *jbd2__journal_start(journal_t *journal, int nblocks, int gfp_mask)
|
handle_t *jbd2__journal_start(journal_t *journal, int nblocks, gfp_t gfp_mask)
|
||||||
{
|
{
|
||||||
handle_t *handle = journal_current_handle();
|
handle_t *handle = journal_current_handle();
|
||||||
int err;
|
int err;
|
||||||
|
@ -443,7 +443,7 @@ out:
|
||||||
* transaction capabable of guaranteeing the requested number of
|
* transaction capabable of guaranteeing the requested number of
|
||||||
* credits.
|
* credits.
|
||||||
*/
|
*/
|
||||||
int jbd2__journal_restart(handle_t *handle, int nblocks, int gfp_mask)
|
int jbd2__journal_restart(handle_t *handle, int nblocks, gfp_t gfp_mask)
|
||||||
{
|
{
|
||||||
transaction_t *transaction = handle->h_transaction;
|
transaction_t *transaction = handle->h_transaction;
|
||||||
journal_t *journal = transaction->t_journal;
|
journal_t *journal = transaction->t_journal;
|
||||||
|
|
|
@ -1106,9 +1106,9 @@ static inline handle_t *journal_current_handle(void)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
extern handle_t *jbd2_journal_start(journal_t *, int nblocks);
|
extern handle_t *jbd2_journal_start(journal_t *, int nblocks);
|
||||||
extern handle_t *jbd2__journal_start(journal_t *, int nblocks, int gfp_mask);
|
extern handle_t *jbd2__journal_start(journal_t *, int nblocks, gfp_t gfp_mask);
|
||||||
extern int jbd2_journal_restart(handle_t *, int nblocks);
|
extern int jbd2_journal_restart(handle_t *, int nblocks);
|
||||||
extern int jbd2__journal_restart(handle_t *, int nblocks, int gfp_mask);
|
extern int jbd2__journal_restart(handle_t *, int nblocks, gfp_t gfp_mask);
|
||||||
extern int jbd2_journal_extend (handle_t *, int nblocks);
|
extern int jbd2_journal_extend (handle_t *, int nblocks);
|
||||||
extern int jbd2_journal_get_write_access(handle_t *, struct buffer_head *);
|
extern int jbd2_journal_get_write_access(handle_t *, struct buffer_head *);
|
||||||
extern int jbd2_journal_get_create_access (handle_t *, struct buffer_head *);
|
extern int jbd2_journal_get_create_access (handle_t *, struct buffer_head *);
|
||||||
|
|
Loading…
Reference in New Issue