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

Commit 5802572e authored by Fabio Falzoi's avatar Fabio Falzoi Committed by Greg Kroah-Hartman
Browse files

Staging: lustre: gfp_mask should be of gfp_t type 



Fixed the following sparse complaints:

drivers/staging/lustre/lustre/ptlrpc/../../lustre/ldlm/ldlm_pool.c:1039:61:
	warning: restricted gfp_t degrades to integer
drivers/staging/lustre/lustre/ptlrpc/../../lustre/ldlm/ldlm_pool.c:1092:61:
	warning: restricted gfp_t degrades to integer
drivers/staging/lustre/lustre/ptlrpc/../../lustre/ldlm/ldlm_pool.c:1136:58:
	warning: incorrect type in argument 2 (different base types)
	expected unsigned int [unsigned] gfp_mask
	got restricted gfp_t [usertype] gfp_mask
drivers/staging/lustre/lustre/ptlrpc/../../lustre/ldlm/ldlm_pool.c:1142:34:
	warning: incorrect type in argument 3 (different base types)
	expected unsigned int [unsigned] gfp_mask
	got restricted gfp_t [usertype] gfp_mask
drivers/staging/lustre/lustre/ptlrpc/../../lustre/ldlm/ldlm_pool.c:1147:58:
	warning: incorrect type in argument 2 (different base types)
	expected unsigned int [unsigned] gfp_mask
	got restricted gfp_t [usertype] gfp_mask
drivers/staging/lustre/lustre/ptlrpc/../../lustre/ldlm/ldlm_pool.c:1153:34:
	warning: incorrect type in argument 3 (different base types)
	expected unsigned int [unsigned] gfp_mask
	got restricted gfp_t [usertype] gfp_mask

Signed-off-by: default avatarFabio Falzoi <fabio.falzoi84@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b9c98cfa

drivers/staging/lustre/lustre/include/lustre_dlm.h

+2 −2
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ struct ldlm_pool_ops { 
	int (*po_recalc)(struct ldlm_pool *pl);

	/** Cancel at least \a nr locks from pool \a pl */

	int (*po_shrink)(struct ldlm_pool *pl, int nr,

			 unsigned int gfp_mask);

			 gfp_t gfp_mask);

	int (*po_setup)(struct ldlm_pool *pl, int limit);

};
@@ -1463,7 +1463,7 @@ void ldlm_pools_fini(void); 
int ldlm_pool_init(struct ldlm_pool *pl, struct ldlm_namespace *ns,

		   int idx, ldlm_side_t client);

int ldlm_pool_shrink(struct ldlm_pool *pl, int nr,

		     unsigned int gfp_mask);

		     gfp_t gfp_mask);

void ldlm_pool_fini(struct ldlm_pool *pl);

int ldlm_pool_setup(struct ldlm_pool *pl, int limit);

int ldlm_pool_recalc(struct ldlm_pool *pl);

drivers/staging/lustre/lustre/ldlm/ldlm_pool.c

+5 −5
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ static int ldlm_srv_pool_recalc(struct ldlm_pool *pl) 
 * locks smaller in next 10h.

 */

static int ldlm_srv_pool_shrink(struct ldlm_pool *pl,

				int nr, unsigned int gfp_mask)

				int nr, gfp_t gfp_mask)

{

	__u32 limit;
@@ -518,7 +518,7 @@ static int ldlm_cli_pool_recalc(struct ldlm_pool *pl) 
 * passed \a pl according to \a nr and \a gfp_mask.

 */

static int ldlm_cli_pool_shrink(struct ldlm_pool *pl,

				int nr, unsigned int gfp_mask)

				int nr, gfp_t gfp_mask)

{

	struct ldlm_namespace *ns;

	int unused;
@@ -603,7 +603,7 @@ int ldlm_pool_recalc(struct ldlm_pool *pl) 
 * freeable locks. Otherwise, return the number of canceled locks.

 */

int ldlm_pool_shrink(struct ldlm_pool *pl, int nr,

		     unsigned int gfp_mask)

		     gfp_t gfp_mask)

{

	int cancel = 0;
@@ -1029,7 +1029,7 @@ static struct completion ldlm_pools_comp; 
 * count locks from all namespaces (if possible). Returns number of

 * cached locks.

 */

static unsigned long ldlm_pools_count(ldlm_side_t client, unsigned int gfp_mask)

static unsigned long ldlm_pools_count(ldlm_side_t client, gfp_t gfp_mask)

{

	int total = 0, nr_ns;

	struct ldlm_namespace *ns;
@@ -1082,7 +1082,7 @@ static unsigned long ldlm_pools_count(ldlm_side_t client, unsigned int gfp_mask) 
	return total;

}



static unsigned long ldlm_pools_scan(ldlm_side_t client, int nr, unsigned int gfp_mask)

static unsigned long ldlm_pools_scan(ldlm_side_t client, int nr, gfp_t gfp_mask)

{

	unsigned long freed = 0;

	int tmp, nr_ns;