staging:lustre: use gfp_t instead of int
authorVitaly Osipov <vitaly.osipov@gmail.com>
Tue, 22 Apr 2014 13:25:21 +0000 (23:25 +1000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 25 Apr 2014 22:08:45 +0000 (15:08 -0700)
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>
drivers/staging/lustre/include/linux/libcfs/libcfs.h
drivers/staging/lustre/lustre/libcfs/module.c
drivers/staging/lustre/lustre/libcfs/tracefile.c
drivers/staging/lustre/lustre/libcfs/tracefile.h
drivers/staging/lustre/lustre/obdecho/echo_client.c

index 4a6c7da721748d45eccb1cb780f1126558183cef..26b53f6420e5013a757e412cf8a3ccea35437528 100644 (file)
@@ -42,6 +42,7 @@
 #endif
 
 #include <linux/libcfs/linux/libcfs.h>
+#include <linux/gfp.h>
 
 #include "curproc.h"
 
index 24ae26d5def395a530998691d5606db25bb19b7c..b16ee08fe742457c2b7754e942797b1bd3015a5d 100644 (file)
@@ -87,7 +87,8 @@ kportal_memhog_free (struct libcfs_device_userstate *ldu)
 }
 
 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 **level1p;
index c8599eefeb76ded414f1b28a06cf9c3f7dd0788c..50d421816c4c7cc74342f4923522065764454d77 100644 (file)
@@ -66,7 +66,7 @@ cfs_tage_from_list(struct list_head *list)
        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 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);
 }
 
-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)
 {
        int i;
index 7e8d17c12b5bf753132285e4e9d81909d0fafd94..55ecfc9f201b3b0476be4d5e40e7cd9baca7f688 100644 (file)
@@ -307,7 +307,7 @@ cfs_trace_put_tcd (struct cfs_trace_cpu_data *tcd)
        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);
 
 
index 754aa8e5566526f8edbe462a67b9a091ded5f7e8..a7f5e41ebf77c6a9405114d8487bd39995720ddc 100644 (file)
@@ -2432,7 +2432,7 @@ static int echo_client_kbrw(struct echo_device *ed, int rw, struct obdo *oa,
        int                  i;
        int                  rc;
        int                  verify;
-       int                  gfp_mask;
+       gfp_t                gfp_mask;
        int                  brw_flags = 0;
 
        verify = (ostid_id(&oa->o_oi) != ECHO_PERSISTENT_OBJID &&