diff options
| author | Omar Sandoval <osandov@osandov.com> | 2014-09-26 11:30:49 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-29 06:04:58 +0400 |
| commit | f1c571dcf01e8f90df31a1f5edc772cc5dde891a (patch) | |
| tree | 9151e303412066164f9721c402c458ebb02e1ef7 /drivers/staging/lustre | |
| parent | 3d3ab8cc684cda4058959d91ed42735d9d605d61 (diff) | |
| download | linux-f1c571dcf01e8f90df31a1f5edc772cc5dde891a.tar.xz | |
staging: lustre: fix gfp_t/int coercion
Fix a few implicit casts between int and gfp_t which were caught by sparse.
Signed-off-by: Omar Sandoval <osandov@osandov.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre')
| -rw-r--r-- | drivers/staging/lustre/lustre/llite/lloop.c | 4 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/ptlrpc/client.c | 2 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/lustre/lustre/llite/lloop.c b/drivers/staging/lustre/lustre/llite/lloop.c index d504a44d5b62..264e5ec3fed6 100644 --- a/drivers/staging/lustre/lustre/llite/lloop.c +++ b/drivers/staging/lustre/lustre/llite/lloop.c @@ -126,7 +126,7 @@ struct lloop_device { struct block_device *lo_device; unsigned lo_blocksize; - int old_gfp_mask; + gfp_t old_gfp_mask; spinlock_t lo_lock; struct bio *lo_bio; @@ -548,7 +548,7 @@ static int loop_clr_fd(struct lloop_device *lo, struct block_device *bdev, int count) { struct file *filp = lo->lo_backing_file; - int gfp = lo->old_gfp_mask; + gfp_t gfp = lo->old_gfp_mask; if (lo->lo_state != LLOOP_BOUND) return -ENXIO; diff --git a/drivers/staging/lustre/lustre/ptlrpc/client.c b/drivers/staging/lustre/lustre/ptlrpc/client.c index 112e30b3d345..38cc931a189c 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/client.c +++ b/drivers/staging/lustre/lustre/ptlrpc/client.c @@ -394,7 +394,7 @@ void ptlrpc_request_cache_fini(void) kmem_cache_destroy(request_cache); } -struct ptlrpc_request *ptlrpc_request_cache_alloc(int flags) +struct ptlrpc_request *ptlrpc_request_cache_alloc(gfp_t flags) { struct ptlrpc_request *req; diff --git a/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h b/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h index f7be007c88cb..7fe2e584ffd7 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h +++ b/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h @@ -57,7 +57,7 @@ struct ptlrpc_bulk_desc *ptlrpc_new_bulk(unsigned npages, unsigned max_brw, unsigned type, unsigned portal); int ptlrpc_request_cache_init(void); void ptlrpc_request_cache_fini(void); -struct ptlrpc_request *ptlrpc_request_cache_alloc(int flags); +struct ptlrpc_request *ptlrpc_request_cache_alloc(gfp_t flags); void ptlrpc_request_cache_free(struct ptlrpc_request *req); void ptlrpc_init_xid(void); |