diff options
author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-01-20 14:01:31 -0300 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-01-20 14:01:31 -0300 |
commit | b4b7ff4b08e691656c9d77c758fc355833128ac0 (patch) | |
tree | 82fcb00e6b918026dc9f2d1f05ed8eee83874cc0 /drivers/staging/lustre/lustre/fld | |
parent | 35acfa0fc609f2a2cd95cef4a6a9c3a5c38f1778 (diff) |
Linux-libre 4.4-gnupck-4.4-gnu
Diffstat (limited to 'drivers/staging/lustre/lustre/fld')
-rw-r--r-- | drivers/staging/lustre/lustre/fld/fld_cache.c | 3 | ||||
-rw-r--r-- | drivers/staging/lustre/lustre/fld/fld_internal.h | 3 | ||||
-rw-r--r-- | drivers/staging/lustre/lustre/fld/fld_request.c | 1 | ||||
-rw-r--r-- | drivers/staging/lustre/lustre/fld/lproc_fld.c | 1 |
4 files changed, 1 insertions, 7 deletions
diff --git a/drivers/staging/lustre/lustre/fld/fld_cache.c b/drivers/staging/lustre/lustre/fld/fld_cache.c index 1b1066b24..446917484 100644 --- a/drivers/staging/lustre/lustre/fld/fld_cache.c +++ b/drivers/staging/lustre/lustre/fld/fld_cache.c @@ -53,7 +53,6 @@ #include "../include/obd_support.h" #include "../include/lprocfs_status.h" -#include "../include/dt_object.h" #include "../include/lustre_req_layout.h" #include "../include/lustre_fld.h" #include "fld_internal.h" @@ -266,7 +265,7 @@ static void fld_cache_punch_hole(struct fld_cache *cache, const u64 new_end = range->lsr_end; struct fld_cache_entry *fldt; - OBD_ALLOC_GFP(fldt, sizeof(*fldt), GFP_ATOMIC); + fldt = kzalloc(sizeof(*fldt), GFP_ATOMIC); if (!fldt) { kfree(f_new); /* overlap is not allowed, so dont mess up list. */ diff --git a/drivers/staging/lustre/lustre/fld/fld_internal.h b/drivers/staging/lustre/lustre/fld/fld_internal.h index 844576b9b..fbb232de6 100644 --- a/drivers/staging/lustre/lustre/fld/fld_internal.h +++ b/drivers/staging/lustre/lustre/fld/fld_internal.h @@ -42,7 +42,6 @@ #define __FLD_INTERNAL_H #include "../include/lustre/lustre_idl.h" -#include "../include/dt_object.h" #include "../../include/linux/libcfs/libcfs.h" #include "../include/lustre_req_layout.h" @@ -175,8 +174,6 @@ void fld_dump_cache_entries(struct fld_cache *cache); struct fld_cache_entry *fld_cache_entry_lookup_nolock(struct fld_cache *cache, struct lu_seq_range *range); -int fld_write_range(const struct lu_env *env, struct dt_object *dt, - const struct lu_seq_range *range, struct thandle *th); static inline const char * fld_target_name(struct lu_fld_target *tar) diff --git a/drivers/staging/lustre/lustre/fld/fld_request.c b/drivers/staging/lustre/lustre/fld/fld_request.c index 1e450bf95..3fd91bc77 100644 --- a/drivers/staging/lustre/lustre/fld/fld_request.c +++ b/drivers/staging/lustre/lustre/fld/fld_request.c @@ -52,7 +52,6 @@ #include "../include/obd_support.h" #include "../include/lprocfs_status.h" -#include "../include/dt_object.h" #include "../include/lustre_req_layout.h" #include "../include/lustre_fld.h" #include "../include/lustre_mdc.h" diff --git a/drivers/staging/lustre/lustre/fld/lproc_fld.c b/drivers/staging/lustre/lustre/fld/lproc_fld.c index da822101e..603f56e60 100644 --- a/drivers/staging/lustre/lustre/fld/lproc_fld.c +++ b/drivers/staging/lustre/lustre/fld/lproc_fld.c @@ -48,7 +48,6 @@ #include "../include/obd.h" #include "../include/obd_class.h" -#include "../include/dt_object.h" #include "../include/obd_support.h" #include "../include/lustre_req_layout.h" #include "../include/lustre_fld.h" |