staging: lustre: remove RETURN macro

[deliverable/linux.git] / drivers / staging / lustre / lustre / lov / lov_request.c

diff --git a/drivers/staging/lustre/lustre/lov/lov_request.c b/drivers/staging/lustre/lustre/lov/lov_request.c
index d975fc550d8534059d3d7c04a66da70dbc69d152..61e6d0b46c98e4898a43867ea0e79b20f8ada587 100644 (file)
--- a/drivers/staging/lustre/lustre/lov/lov_request.c
+++ b/drivers/staging/lustre/lustre/lov/lov_request.c
@@ -129,7 +129,7 @@ int lov_update_common_set(struct lov_request_set *set,
                rc = 0;
 
        /* FIXME in raid1 regime, should return 0 */
-       RETURN(rc);
+       return rc;
 }
 
 void lov_set_add_req(struct lov_request *req, struct lov_request_set *set)
@@ -250,7 +250,7 @@ int lov_update_enqueue_set(struct lov_request *req, __u32 mode, int rc)
                                    req->rq_idx, &oi->oi_md->lsm_oi, rc);
        lov_stripe_unlock(oi->oi_md);
        lov_update_set(set, req, rc);
-       RETURN(rc);
+       return rc;
 }
 
 /* The callback for osc_enqueue that updates lov info for every OSC request. */
@@ -274,7 +274,7 @@ static int enqueue_done(struct lov_request_set *set, __u32 mode)
 
        /* enqueue/match success, just return */
        if (completes && completes == atomic_read(&set->set_success))
-               RETURN(0);
+               return 0;
 
        /* cancel enqueued/matched locks */
        list_for_each_entry(req, &set->set_list, rq_link) {
@@ -300,7 +300,7 @@ static int enqueue_done(struct lov_request_set *set, __u32 mode)
        }
        if (set->set_lockh)
                lov_llh_put(set->set_lockh);
-       RETURN(rc);
+       return rc;
 }
 
 int lov_fini_enqueue_set(struct lov_request_set *set, __u32 mode, int rc,
@@ -309,7 +309,7 @@ int lov_fini_enqueue_set(struct lov_request_set *set, __u32 mode, int rc,
        int ret = 0;
 
        if (set == NULL)
-               RETURN(0);
+               return 0;
        LASSERT(set->set_exp);
        /* Do enqueue_done only for sync requests and if any request
         * succeeded. */
@@ -322,7 +322,7 @@ int lov_fini_enqueue_set(struct lov_request_set *set, __u32 mode, int rc,
 
        lov_put_reqset(set);
 
-       RETURN(rc ? rc : ret);
+       return rc ? rc : ret;
 }
 
 static void lov_llh_addref(void *llhp)
@@ -366,7 +366,7 @@ int lov_prep_enqueue_set(struct obd_export *exp, struct obd_info *oinfo,
 
        OBD_ALLOC(set, sizeof(*set));
        if (set == NULL)
-               RETURN(-ENOMEM);
+               return -ENOMEM;
        lov_init_set(set);
 
        set->set_exp = exp;
@@ -438,10 +438,10 @@ int lov_prep_enqueue_set(struct obd_export *exp, struct obd_info *oinfo,
        if (!set->set_count)
                GOTO(out_set, rc = -EIO);
        *reqset = set;
-       RETURN(0);
+       return 0;
 out_set:
        lov_fini_enqueue_set(set, einfo->ei_mode, rc, NULL);
-       RETURN(rc);
+       return rc;
 }
 
 int lov_fini_match_set(struct lov_request_set *set, __u32 mode, int flags)
@@ -449,7 +449,7 @@ int lov_fini_match_set(struct lov_request_set *set, __u32 mode, int flags)
        int rc = 0;
 
        if (set == NULL)
-               RETURN(0);
+               return 0;
        LASSERT(set->set_exp);
        rc = enqueue_done(set, mode);
        if ((set->set_count == atomic_read(&set->set_success)) &&
@@ -458,7 +458,7 @@ int lov_fini_match_set(struct lov_request_set *set, __u32 mode, int flags)
 
        lov_put_reqset(set);
 
-       RETURN(rc);
+       return rc;
 }
 
 int lov_prep_match_set(struct obd_export *exp, struct obd_info *oinfo,
@@ -472,7 +472,7 @@ int lov_prep_match_set(struct obd_export *exp, struct obd_info *oinfo,
 
        OBD_ALLOC(set, sizeof(*set));
        if (set == NULL)
-               RETURN(-ENOMEM);
+               return -ENOMEM;
        lov_init_set(set);
 
        set->set_exp = exp;
@@ -526,10 +526,10 @@ int lov_prep_match_set(struct obd_export *exp, struct obd_info *oinfo,
        if (!set->set_count)
                GOTO(out_set, rc = -EIO);
        *reqset = set;
-       RETURN(rc);
+       return rc;
 out_set:
        lov_fini_match_set(set, mode, 0);
-       RETURN(rc);
+       return rc;
 }
 
 int lov_fini_cancel_set(struct lov_request_set *set)
@@ -537,7 +537,7 @@ int lov_fini_cancel_set(struct lov_request_set *set)
        int rc = 0;
 
        if (set == NULL)
-               RETURN(0);
+               return 0;
 
        LASSERT(set->set_exp);
        if (set->set_lockh)
@@ -545,7 +545,7 @@ int lov_fini_cancel_set(struct lov_request_set *set)
 
        lov_put_reqset(set);
 
-       RETURN(rc);
+       return rc;
 }
 
 int lov_prep_cancel_set(struct obd_export *exp, struct obd_info *oinfo,
@@ -558,7 +558,7 @@ int lov_prep_cancel_set(struct obd_export *exp, struct obd_info *oinfo,
 
        OBD_ALLOC(set, sizeof(*set));
        if (set == NULL)
-               RETURN(-ENOMEM);
+               return -ENOMEM;
        lov_init_set(set);
 
        set->set_exp = exp;
@@ -606,10 +606,10 @@ int lov_prep_cancel_set(struct obd_export *exp, struct obd_info *oinfo,
        if (!set->set_count)
                GOTO(out_set, rc = -EIO);
        *reqset = set;
-       RETURN(rc);
+       return rc;
 out_set:
        lov_fini_cancel_set(set);
-       RETURN(rc);
+       return rc;
 }
 static int common_attr_done(struct lov_request_set *set)
 {
@@ -621,10 +621,10 @@ static int common_attr_done(struct lov_request_set *set)
        LASSERT(set->set_oi != NULL);
 
        if (set->set_oi->oi_oa == NULL)
-               RETURN(0);
+               return 0;
 
        if (!atomic_read(&set->set_success))
-               RETURN(-EIO);
+               return -EIO;
 
        OBDO_ALLOC(tmp_oa);
        if (tmp_oa == NULL)
@@ -658,7 +658,7 @@ static int common_attr_done(struct lov_request_set *set)
 out:
        if (tmp_oa)
                OBDO_FREE(tmp_oa);
-       RETURN(rc);
+       return rc;
 
 }
 
@@ -681,7 +681,7 @@ static int brw_done(struct lov_request_set *set)
                        loi->loi_lvb.lvb_blocks = req->rq_oi.oi_oa->o_blocks;
        }
 
-       RETURN(0);
+       return 0;
 }
 
 int lov_fini_brw_set(struct lov_request_set *set)
@@ -689,7 +689,7 @@ int lov_fini_brw_set(struct lov_request_set *set)
        int rc = 0;
 
        if (set == NULL)
-               RETURN(0);
+               return 0;
        LASSERT(set->set_exp);
        if (atomic_read(&set->set_completes)) {
                rc = brw_done(set);
@@ -697,7 +697,7 @@ int lov_fini_brw_set(struct lov_request_set *set)
        }
        lov_put_reqset(set);
 
-       RETURN(rc);
+       return rc;
 }
 
 int lov_prep_brw_set(struct obd_export *exp, struct obd_info *oinfo,
@@ -716,7 +716,7 @@ int lov_prep_brw_set(struct obd_export *exp, struct obd_info *oinfo,
 
        OBD_ALLOC(set, sizeof(*set));
        if (set == NULL)
-               RETURN(-ENOMEM);
+               return -ENOMEM;
        lov_init_set(set);
 
        set->set_exp = exp;
@@ -817,7 +817,7 @@ out:
        else
                lov_fini_brw_set(set);
 
-       RETURN(rc);
+       return rc;
 }
 
 int lov_fini_getattr_set(struct lov_request_set *set)
@@ -825,14 +825,14 @@ int lov_fini_getattr_set(struct lov_request_set *set)
        int rc = 0;
 
        if (set == NULL)
-               RETURN(0);
+               return 0;
        LASSERT(set->set_exp);
        if (atomic_read(&set->set_completes))
                rc = common_attr_done(set);
 
        lov_put_reqset(set);
 
-       RETURN(rc);
+       return rc;
 }
 
 /* The callback for osc_getattr_async that finilizes a request info when a
@@ -854,7 +854,7 @@ int lov_prep_getattr_set(struct obd_export *exp, struct obd_info *oinfo,
 
        OBD_ALLOC(set, sizeof(*set));
        if (set == NULL)
-               RETURN(-ENOMEM);
+               return -ENOMEM;
        lov_init_set(set);
 
        set->set_exp = exp;
@@ -896,16 +896,16 @@ int lov_prep_getattr_set(struct obd_export *exp, struct obd_info *oinfo,
        if (!set->set_count)
                GOTO(out_set, rc = -EIO);
        *reqset = set;
-       RETURN(rc);
+       return rc;
 out_set:
        lov_fini_getattr_set(set);
-       RETURN(rc);
+       return rc;
 }
 
 int lov_fini_destroy_set(struct lov_request_set *set)
 {
        if (set == NULL)
-               RETURN(0);
+               return 0;
        LASSERT(set->set_exp);
        if (atomic_read(&set->set_completes)) {
                /* FIXME update qos data here */
@@ -913,7 +913,7 @@ int lov_fini_destroy_set(struct lov_request_set *set)
 
        lov_put_reqset(set);
 
-       RETURN(0);
+       return 0;
 }
 
 int lov_prep_destroy_set(struct obd_export *exp, struct obd_info *oinfo,
@@ -927,7 +927,7 @@ int lov_prep_destroy_set(struct obd_export *exp, struct obd_info *oinfo,
 
        OBD_ALLOC(set, sizeof(*set));
        if (set == NULL)
-               RETURN(-ENOMEM);
+               return -ENOMEM;
        lov_init_set(set);
 
        set->set_exp = exp;
@@ -967,10 +967,10 @@ int lov_prep_destroy_set(struct obd_export *exp, struct obd_info *oinfo,
        if (!set->set_count)
                GOTO(out_set, rc = -EIO);
        *reqset = set;
-       RETURN(rc);
+       return rc;
 out_set:
        lov_fini_destroy_set(set);
-       RETURN(rc);
+       return rc;
 }
 
 int lov_fini_setattr_set(struct lov_request_set *set)
@@ -978,7 +978,7 @@ int lov_fini_setattr_set(struct lov_request_set *set)
        int rc = 0;
 
        if (set == NULL)
-               RETURN(0);
+               return 0;
        LASSERT(set->set_exp);
        if (atomic_read(&set->set_completes)) {
                rc = common_attr_done(set);
@@ -986,7 +986,7 @@ int lov_fini_setattr_set(struct lov_request_set *set)
        }
 
        lov_put_reqset(set);
-       RETURN(rc);
+       return rc;
 }
 
 int lov_update_setattr_set(struct lov_request_set *set,
@@ -1014,7 +1014,7 @@ int lov_update_setattr_set(struct lov_request_set *set,
                                req->rq_oi.oi_oa->o_atime;
        }
 
-       RETURN(rc);
+       return rc;
 }
 
 /* The callback for osc_setattr_async that finilizes a request info when a
@@ -1037,7 +1037,7 @@ int lov_prep_setattr_set(struct obd_export *exp, struct obd_info *oinfo,
 
        OBD_ALLOC(set, sizeof(*set));
        if (set == NULL)
-               RETURN(-ENOMEM);
+               return -ENOMEM;
        lov_init_set(set);
 
        set->set_exp = exp;
@@ -1090,10 +1090,10 @@ int lov_prep_setattr_set(struct obd_export *exp, struct obd_info *oinfo,
        if (!set->set_count)
                GOTO(out_set, rc = -EIO);
        *reqset = set;
-       RETURN(rc);
+       return rc;
 out_set:
        lov_fini_setattr_set(set);
-       RETURN(rc);
+       return rc;
 }
 
 int lov_fini_punch_set(struct lov_request_set *set)
@@ -1101,7 +1101,7 @@ int lov_fini_punch_set(struct lov_request_set *set)
        int rc = 0;
 
        if (set == NULL)
-               RETURN(0);
+               return 0;
        LASSERT(set->set_exp);
        if (atomic_read(&set->set_completes)) {
                rc = -EIO;
@@ -1112,7 +1112,7 @@ int lov_fini_punch_set(struct lov_request_set *set)
 
        lov_put_reqset(set);
 
-       RETURN(rc);
+       return rc;
 }
 
 int lov_update_punch_set(struct lov_request_set *set,
@@ -1137,7 +1137,7 @@ int lov_update_punch_set(struct lov_request_set *set,
                lov_stripe_unlock(lsm);
        }
 
-       RETURN(rc);
+       return rc;
 }
 
 /* The callback for osc_punch that finilizes a request info when a response
@@ -1160,7 +1160,7 @@ int lov_prep_punch_set(struct obd_export *exp, struct obd_info *oinfo,
 
        OBD_ALLOC(set, sizeof(*set));
        if (set == NULL)
-               RETURN(-ENOMEM);
+               return -ENOMEM;
        lov_init_set(set);
 
        set->set_oi = oinfo;
@@ -1212,10 +1212,10 @@ int lov_prep_punch_set(struct obd_export *exp, struct obd_info *oinfo,
        if (!set->set_count)
                GOTO(out_set, rc = -EIO);
        *reqset = set;
-       RETURN(rc);
+       return rc;
 out_set:
        lov_fini_punch_set(set);
-       RETURN(rc);
+       return rc;
 }
 
 int lov_fini_sync_set(struct lov_request_set *set)
@@ -1223,7 +1223,7 @@ int lov_fini_sync_set(struct lov_request_set *set)
        int rc = 0;
 
        if (set == NULL)
-               RETURN(0);
+               return 0;
        LASSERT(set->set_exp);
        if (atomic_read(&set->set_completes)) {
                if (!atomic_read(&set->set_success))
@@ -1233,7 +1233,7 @@ int lov_fini_sync_set(struct lov_request_set *set)
 
        lov_put_reqset(set);
 
-       RETURN(rc);
+       return rc;
 }
 
 /* The callback for osc_sync that finilizes a request info when a
@@ -1257,7 +1257,7 @@ int lov_prep_sync_set(struct obd_export *exp, struct obd_info *oinfo,
 
        OBD_ALLOC_PTR(set);
        if (set == NULL)
-               RETURN(-ENOMEM);
+               return -ENOMEM;
        lov_init_set(set);
 
        set->set_exp = exp;
@@ -1302,10 +1302,10 @@ int lov_prep_sync_set(struct obd_export *exp, struct obd_info *oinfo,
        if (!set->set_count)
                GOTO(out_set, rc = -EIO);
        *reqset = set;
-       RETURN(rc);
+       return rc;
 out_set:
        lov_fini_sync_set(set);
-       RETURN(rc);
+       return rc;
 }
 
 #define LOV_U64_MAX ((__u64)~0ULL)
@@ -1331,10 +1331,10 @@ int lov_fini_statfs(struct obd_device *obd, struct obd_statfs *osfs,int success)
                memcpy(&obd->obd_osfs, osfs, sizeof(*osfs));
                obd->obd_osfs_age = cfs_time_current_64();
                spin_unlock(&obd->obd_osfs_lock);
-               RETURN(0);
+               return 0;
        }
 
-       RETURN(-EIO);
+       return -EIO;
 }
 
 int lov_fini_statfs_set(struct lov_request_set *set)
@@ -1342,14 +1342,14 @@ int lov_fini_statfs_set(struct lov_request_set *set)
        int rc = 0;
 
        if (set == NULL)
-               RETURN(0);
+               return 0;
 
        if (atomic_read(&set->set_completes)) {
                rc = lov_fini_statfs(set->set_obd, set->set_oi->oi_osfs,
                                     atomic_read(&set->set_success));
        }
        lov_put_reqset(set);
-       RETURN(rc);
+       return rc;
 }
 
 void lov_update_statfs(struct obd_statfs *osfs, struct obd_statfs *lov_sfs,
@@ -1456,7 +1456,7 @@ out:
                                     atomic_read(&set->set_success));
        }
 
-       RETURN(0);
+       return 0;
 }
 
 int lov_prep_statfs_set(struct obd_device *obd, struct obd_info *oinfo,
@@ -1468,7 +1468,7 @@ int lov_prep_statfs_set(struct obd_device *obd, struct obd_info *oinfo,
 
        OBD_ALLOC(set, sizeof(*set));
        if (set == NULL)
-               RETURN(-ENOMEM);
+               return -ENOMEM;
        lov_init_set(set);
 
        set->set_obd = obd;
@@ -1511,8 +1511,8 @@ int lov_prep_statfs_set(struct obd_device *obd, struct obd_info *oinfo,
        if (!set->set_count)
                GOTO(out_set, rc = -EIO);
        *reqset = set;
-       RETURN(rc);
+       return rc;
 out_set:
        lov_fini_statfs_set(set);
-       RETURN(rc);
+       return rc;
 }