diff options
Diffstat (limited to 'drivers/staging/lustre/lustre/lov/lov_dev.c')
| -rw-r--r-- | drivers/staging/lustre/lustre/lov/lov_dev.c | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/drivers/staging/lustre/lustre/lov/lov_dev.c b/drivers/staging/lustre/lustre/lov/lov_dev.c index f94f8d9d33d..a4006ef46ad 100644 --- a/drivers/staging/lustre/lustre/lov/lov_dev.c +++ b/drivers/staging/lustre/lustre/lov/lov_dev.c @@ -122,10 +122,8 @@ static void lov_req_completion(const struct lu_env *env, { struct lov_req *lr; - ENTRY; lr = cl2lov_req(slice); OBD_SLAB_FREE_PTR(lr, lov_req_kmem); - EXIT; } static const struct cl_req_operations lov_req_ops = { @@ -200,7 +198,7 @@ static struct lu_device *lov_device_fini(const struct lu_env *env, LASSERT(ld->ld_lov != NULL); if (ld->ld_target == NULL) - RETURN(NULL); + return NULL; lov_foreach_target(ld, i) { struct lovsub_device *lsd; @@ -211,7 +209,7 @@ static struct lu_device *lov_device_fini(const struct lu_env *env, ld->ld_target[i] = NULL; } } - RETURN(NULL); + return NULL; } static int lov_device_init(const struct lu_env *env, struct lu_device *d, @@ -223,7 +221,7 @@ static int lov_device_init(const struct lu_env *env, struct lu_device *d, LASSERT(d->ld_site != NULL); if (ld->ld_target == NULL) - RETURN(rc); + return rc; lov_foreach_target(ld, i) { struct lovsub_device *lsd; @@ -251,7 +249,7 @@ static int lov_device_init(const struct lu_env *env, struct lu_device *d, else ld->ld_flags |= LOV_DEV_INITIALIZED; - RETURN(rc); + return rc; } static int lov_req_init(const struct lu_env *env, struct cl_device *dev, @@ -260,14 +258,13 @@ static int lov_req_init(const struct lu_env *env, struct cl_device *dev, struct lov_req *lr; int result; - ENTRY; OBD_SLAB_ALLOC_PTR_GFP(lr, lov_req_kmem, __GFP_IO); if (lr != NULL) { cl_req_slice_add(req, &lr->lr_cl, dev, &lov_req_ops); result = 0; } else result = -ENOMEM; - RETURN(result); + return result; } static const struct cl_device_operations lov_cl_ops = { @@ -311,13 +308,11 @@ static void lov_cl_del_target(const struct lu_env *env, struct lu_device *dev, __u32 index) { struct lov_device *ld = lu2lov_dev(dev); - ENTRY; if (ld->ld_target[index] != NULL) { cl_stack_fini(env, lovsub2cl_dev(ld->ld_target[index])); ld->ld_target[index] = NULL; } - EXIT; } static struct lov_device_emerg **lov_emerg_alloc(int nr) @@ -360,7 +355,6 @@ static int lov_expand_targets(const struct lu_env *env, struct lov_device *dev) __u32 tgt_size; __u32 sub_size; - ENTRY; result = 0; tgt_size = dev->ld_lov->lov_tgt_size; sub_size = dev->ld_target_nr; @@ -371,7 +365,7 @@ static int lov_expand_targets(const struct lu_env *env, struct lov_device *dev) emerg = lov_emerg_alloc(tgt_size); if (IS_ERR(emerg)) - RETURN(PTR_ERR(emerg)); + return PTR_ERR(emerg); OBD_ALLOC(newd, tgt_size * sz); if (newd != NULL) { @@ -392,7 +386,7 @@ static int lov_expand_targets(const struct lu_env *env, struct lov_device *dev) result = -ENOMEM; } } - RETURN(result); + return result; } static int lov_cl_add_target(const struct lu_env *env, struct lu_device *dev, @@ -404,7 +398,6 @@ static int lov_cl_add_target(const struct lu_env *env, struct lu_device *dev, struct lovsub_device *lsd; struct cl_device *cl; int rc; - ENTRY; obd_getref(obd); @@ -414,7 +407,7 @@ static int lov_cl_add_target(const struct lu_env *env, struct lu_device *dev, if (!tgt->ltd_obd->obd_set_up) { CERROR("Target %s not set up\n", obd_uuid2str(&tgt->ltd_uuid)); - RETURN(-EINVAL); + return -EINVAL; } rc = lov_expand_targets(env, ld); @@ -436,7 +429,7 @@ static int lov_cl_add_target(const struct lu_env *env, struct lu_device *dev, } } obd_putref(obd); - RETURN(rc); + return rc; } static int lov_process_config(const struct lu_env *env, @@ -466,7 +459,7 @@ static int lov_process_config(const struct lu_env *env, } } obd_putref(obd); - RETURN(rc); + return rc; } static const struct lu_device_operations lov_lu_ops = { @@ -485,7 +478,7 @@ static struct lu_device *lov_device_alloc(const struct lu_env *env, OBD_ALLOC_PTR(ld); if (ld == NULL) - RETURN(ERR_PTR(-ENOMEM)); + return ERR_PTR(-ENOMEM); cl_device_init(&ld->ld_cl, t); d = lov2lu_dev(ld); @@ -501,11 +494,11 @@ static struct lu_device *lov_device_alloc(const struct lu_env *env, rc = lov_setup(obd, cfg); if (rc) { lov_device_free(env, d); - RETURN(ERR_PTR(rc)); + return ERR_PTR(rc); } ld->ld_lov = &obd->u.lov; - RETURN(d); + return d; } static const struct lu_device_type_operations lov_device_type_ops = { |