iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: lustre: fix gfp_t/int coercion

Browse Source 
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>
This commit is contained in:
Omar Sandoval 2014-09-26 00:30:49 -07:00 committed by Greg Kroah-Hartman
parent 3d3ab8cc68
commit f1c571dcf0
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/lustre/lustre/llite/lloop.c
View File

@ -126,7 +126,7 @@ struct lloop_device {
struct block_device *lo_device; struct block_device *lo_device;
unsigned lo_blocksize; unsigned lo_blocksize;
int old_gfp_mask; gfp_t old_gfp_mask;
spinlock_t lo_lock; spinlock_t lo_lock;
struct bio *lo_bio; struct bio *lo_bio;
@ -548,7 +548,7 @@ static int loop_clr_fd(struct lloop_device *lo, struct block_device *bdev,
int count) int count)
{ {
struct file *filp = lo->lo_backing_file; 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) if (lo->lo_state != LLOOP_BOUND)
return -ENXIO; return -ENXIO;

2
drivers/staging/lustre/lustre/ptlrpc/client.c
View File

@ -394,7 +394,7 @@ void ptlrpc_request_cache_fini(void)
kmem_cache_destroy(request_cache); 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; struct ptlrpc_request *req;

2
drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h
View File

@ -57,7 +57,7 @@ struct ptlrpc_bulk_desc *ptlrpc_new_bulk(unsigned npages, unsigned max_brw,
unsigned type, unsigned portal); unsigned type, unsigned portal);
int ptlrpc_request_cache_init(void); int ptlrpc_request_cache_init(void);
void ptlrpc_request_cache_fini(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_request_cache_free(struct ptlrpc_request *req);
void ptlrpc_init_xid(void); void ptlrpc_init_xid(void);