Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1c571dc authored by Omar Sandoval's avatar Omar Sandoval Committed by Greg Kroah-Hartman
Browse files

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: default avatarOmar Sandoval <osandov@osandov.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3d3ab8cc

drivers/staging/lustre/lustre/llite/lloop.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/staging/lustre/lustre/ptlrpc/client.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -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);