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

Commit cad7aa13 authored Apr 22, 2014 by Vitaly Osipov Committed by Greg Kroah-Hartman Apr 25, 2014

staging:lustre: use gfp_t instead of int



Fixed several sparse "warning: incorrect type" by replacing int
declarations with gfp_t

Signed-off-by: Vitaly Osipov <vitaly.osipov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 7cc054d0

drivers/staging/lustre/include/linux/libcfs/libcfs.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -42,6 +42,7 @@
	#endif		#endif

	#include <linux/libcfs/linux/libcfs.h>		#include <linux/libcfs/linux/libcfs.h>
			#include <linux/gfp.h>

	#include "curproc.h"		#include "curproc.h"

drivers/staging/lustre/lustre/libcfs/module.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -87,7 +87,8 @@ kportal_memhog_free (struct libcfs_device_userstate *ldu)
	}		}

	int		int
	kportal_memhog_alloc (struct libcfs_device_userstate *ldu, int npages, int flags)		kportal_memhog_alloc(struct libcfs_device_userstate *ldu, int npages,
			gfp_t flags)
	{		{
	struct page **level0p;		struct page **level0p;
	struct page **level1p;		struct page **level1p;

drivers/staging/lustre/lustre/libcfs/tracefile.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -66,7 +66,7 @@ cfs_tage_from_list(struct list_head *list)
	return list_entry(list, struct cfs_trace_page, linkage);		return list_entry(list, struct cfs_trace_page, linkage);
	}		}

	static struct cfs_trace_page *cfs_tage_alloc(int gfp)		static struct cfs_trace_page *cfs_tage_alloc(gfp_t gfp)
	{		{
	struct page *page;		struct page *page;
	struct cfs_trace_page *tage;		struct cfs_trace_page *tage;
	@@ -114,7 +114,7 @@ static void cfs_tage_to_tail(struct cfs_trace_page *tage,
	list_move_tail(&tage->linkage, queue);		list_move_tail(&tage->linkage, queue);
	}		}

	int cfs_trace_refill_stock(struct cfs_trace_cpu_data *tcd, int gfp,		int cfs_trace_refill_stock(struct cfs_trace_cpu_data *tcd, gfp_t gfp,
	struct list_head *stock)		struct list_head *stock)
	{		{
	int i;		int i;

drivers/staging/lustre/lustre/libcfs/tracefile.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -307,7 +307,7 @@ cfs_trace_put_tcd (struct cfs_trace_cpu_data *tcd)
	put_cpu();		put_cpu();
	}		}

	int cfs_trace_refill_stock(struct cfs_trace_cpu_data *tcd, int gfp,		int cfs_trace_refill_stock(struct cfs_trace_cpu_data *tcd, gfp_t gfp,
	struct list_head *stock);		struct list_head *stock);

drivers/staging/lustre/lustre/obdecho/echo_client.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2432,7 +2432,7 @@ static int echo_client_kbrw(struct echo_device ed, int rw, struct obdo oa,
	int i;		int i;
	int rc;		int rc;
	int verify;		int verify;
	int gfp_mask;		gfp_t gfp_mask;
	int brw_flags = 0;		int brw_flags = 0;

	verify = (ostid_id(&oa->o_oi) != ECHO_PERSISTENT_OBJID &&		verify = (ostid_id(&oa->o_oi) != ECHO_PERSISTENT_OBJID &&