staging: lustre: remove RETURN macro

[deliverable/linux.git] / drivers / staging / lustre / lustre / obdclass / cl_io.c

diff --git a/drivers/staging/lustre/lustre/obdclass/cl_io.c b/drivers/staging/lustre/lustre/obdclass/cl_io.c
index 96a299b4fb91ebe27e010c4f8909d8e6acc2445a..42697934155493e5c1c5a79576bce699f3f1ee28 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/cl_io.c
+++ b/drivers/staging/lustre/lustre/obdclass/cl_io.c
@@ -143,7 +143,6 @@ void cl_io_fini(const struct lu_env *env, struct cl_io *io)
        default:
                LBUG();
        }
-       EXIT;
 }
 EXPORT_SYMBOL(cl_io_fini);
 
@@ -173,7 +172,7 @@ static int cl_io_init0(const struct lu_env *env, struct cl_io *io,
        }
        if (result == 0)
                io->ci_state = CIS_INIT;
-       RETURN(result);
+       return result;
 }
 
 /**
@@ -233,7 +232,7 @@ int cl_io_rw_init(const struct lu_env *env, struct cl_io *io,
                         io->u.ci_rw.crw_nonblock, io->u.ci_wr.wr_append);
        io->u.ci_rw.crw_pos    = pos;
        io->u.ci_rw.crw_count  = count;
-       RETURN(cl_io_init(env, io, iot, io->ci_obj));
+       return cl_io_init(env, io, iot, io->ci_obj);
 }
 EXPORT_SYMBOL(cl_io_rw_init);
 
@@ -321,7 +320,6 @@ static void cl_io_locks_sort(struct cl_io *io)
                        prev = curr;
                }
        } while (!done);
-       EXIT;
 }
 
 /**
@@ -337,9 +335,9 @@ int cl_queue_match(const struct list_head *queue,
 
        list_for_each_entry(scan, queue, cill_linkage) {
               if (cl_lock_descr_match(&scan->cill_descr, need))
-                      RETURN(+1);
+                      return +1;
        }
-       RETURN(0);
+       return 0;
 }
 EXPORT_SYMBOL(cl_queue_match);
 
@@ -355,9 +353,9 @@ static int cl_queue_merge(const struct list_head *queue,
               CDEBUG(D_VFSTRACE, "lock: %d: [%lu, %lu]\n",
                      scan->cill_descr.cld_mode, scan->cill_descr.cld_start,
                      scan->cill_descr.cld_end);
-              RETURN(+1);
+              return +1;
        }
-       RETURN(0);
+       return 0;
 
 }
 
@@ -396,7 +394,7 @@ static int cl_lockset_lock_one(const struct lu_env *env,
                        result = 0;
        } else
                result = PTR_ERR(lock);
-       RETURN(result);
+       return result;
 }
 
 static void cl_lock_link_fini(const struct lu_env *env, struct cl_io *io,
@@ -411,7 +409,6 @@ static void cl_lock_link_fini(const struct lu_env *env, struct cl_io *io,
        }
        if (link->cill_fini != NULL)
                link->cill_fini(env, link);
-       EXIT;
 }
 
 static int cl_lockset_lock(const struct lu_env *env, struct cl_io *io,
@@ -445,7 +442,7 @@ static int cl_lockset_lock(const struct lu_env *env, struct cl_io *io,
                                break;
                }
        }
-       RETURN(result);
+       return result;
 }
 
 /**
@@ -479,7 +476,7 @@ int cl_io_lock(const struct lu_env *env, struct cl_io *io)
                cl_io_unlock(env, io);
        else
                io->ci_state = CIS_LOCKED;
-       RETURN(result);
+       return result;
 }
 EXPORT_SYMBOL(cl_io_lock);
 
@@ -515,7 +512,6 @@ void cl_io_unlock(const struct lu_env *env, struct cl_io *io)
        }
        io->ci_state = CIS_UNLOCKED;
        LASSERT(!cl_env_info(env)->clt_counters[CNL_TOP].ctc_nr_locks_acquired);
-       EXIT;
 }
 EXPORT_SYMBOL(cl_io_unlock);
 
@@ -546,7 +542,7 @@ int cl_io_iter_init(const struct lu_env *env, struct cl_io *io)
        }
        if (result == 0)
                io->ci_state = CIS_IT_STARTED;
-       RETURN(result);
+       return result;
 }
 EXPORT_SYMBOL(cl_io_iter_init);
 
@@ -568,7 +564,6 @@ void cl_io_iter_fini(const struct lu_env *env, struct cl_io *io)
                        scan->cis_iop->op[io->ci_type].cio_iter_fini(env, scan);
        }
        io->ci_state = CIS_IT_ENDED;
-       EXIT;
 }
 EXPORT_SYMBOL(cl_io_iter_fini);
 
@@ -593,7 +588,6 @@ void cl_io_rw_advance(const struct lu_env *env, struct cl_io *io, size_t nob)
                        scan->cis_iop->op[io->ci_type].cio_advance(env, scan,
                                                                   nob);
        }
-       EXIT;
 }
 EXPORT_SYMBOL(cl_io_rw_advance);
 
@@ -611,7 +605,7 @@ int cl_io_lock_add(const struct lu_env *env, struct cl_io *io,
                list_add(&link->cill_linkage, &io->ci_lockset.cls_todo);
                result = 0;
        }
-       RETURN(result);
+       return result;
 }
 EXPORT_SYMBOL(cl_io_lock_add);
 
@@ -640,7 +634,7 @@ int cl_io_lock_alloc_add(const struct lu_env *env, struct cl_io *io,
        } else
                result = -ENOMEM;
 
-       RETURN(result);
+       return result;
 }
 EXPORT_SYMBOL(cl_io_lock_alloc_add);
 
@@ -666,7 +660,7 @@ int cl_io_start(const struct lu_env *env, struct cl_io *io)
        }
        if (result >= 0)
                result = 0;
-       RETURN(result);
+       return result;
 }
 EXPORT_SYMBOL(cl_io_start);
 
@@ -688,7 +682,6 @@ void cl_io_end(const struct lu_env *env, struct cl_io *io)
                /* TODO: error handling. */
        }
        io->ci_state = CIS_IO_FINISHED;
-       EXIT;
 }
 EXPORT_SYMBOL(cl_io_end);
 
@@ -786,7 +779,7 @@ int cl_io_read_page(const struct lu_env *env, struct cl_io *io,
         */
        cl_page_list_disown(env, io, &queue->c2_qin);
        cl_2queue_fini(env, queue);
-       RETURN(result);
+       return result;
 }
 EXPORT_SYMBOL(cl_io_read_page);
 
@@ -819,7 +812,7 @@ int cl_io_prepare_write(const struct lu_env *env, struct cl_io *io,
                                break;
                }
        }
-       RETURN(result);
+       return result;
 }
 EXPORT_SYMBOL(cl_io_prepare_write);
 
@@ -859,7 +852,7 @@ int cl_io_commit_write(const struct lu_env *env, struct cl_io *io,
                }
        }
        LINVRNT(result <= 0);
-       RETURN(result);
+       return result;
 }
 EXPORT_SYMBOL(cl_io_commit_write);
 
@@ -893,7 +886,7 @@ int cl_io_submit_rw(const struct lu_env *env, struct cl_io *io,
         * If ->cio_submit() failed, no pages were sent.
         */
        LASSERT(ergo(result != 0, list_empty(&queue->c2_qout.pl_pages)));
-       RETURN(result);
+       return result;
 }
 EXPORT_SYMBOL(cl_io_submit_rw);
 
@@ -1018,7 +1011,7 @@ int cl_io_loop(const struct lu_env *env, struct cl_io *io)
        } while (result == 0 && io->ci_continue);
        if (result == 0)
                result = io->ci_result;
-       RETURN(result < 0 ? result : 0);
+       return result < 0 ? result : 0;
 }
 EXPORT_SYMBOL(cl_io_loop);
 
@@ -1044,7 +1037,6 @@ void cl_io_slice_add(struct cl_io *io, struct cl_io_slice *slice,
        slice->cis_io  = io;
        slice->cis_obj = obj;
        slice->cis_iop = ops;
-       EXIT;
 }
 EXPORT_SYMBOL(cl_io_slice_add);
 
@@ -1057,7 +1049,6 @@ void cl_page_list_init(struct cl_page_list *plist)
        plist->pl_nr = 0;
        INIT_LIST_HEAD(&plist->pl_pages);
        plist->pl_owner = current;
-       EXIT;
 }
 EXPORT_SYMBOL(cl_page_list_init);
 
@@ -1079,7 +1070,6 @@ void cl_page_list_add(struct cl_page_list *plist, struct cl_page *page)
        ++plist->pl_nr;
        lu_ref_add_at(&page->cp_reference, &page->cp_queue_ref, "queue", plist);
        cl_page_get(page);
-       EXIT;
 }
 EXPORT_SYMBOL(cl_page_list_add);
 
@@ -1099,7 +1089,6 @@ void cl_page_list_del(const struct lu_env *env,
        --plist->pl_nr;
        lu_ref_del_at(&page->cp_reference, &page->cp_queue_ref, "queue", plist);
        cl_page_put(env, page);
-       EXIT;
 }
 EXPORT_SYMBOL(cl_page_list_del);
 
@@ -1118,7 +1107,6 @@ void cl_page_list_move(struct cl_page_list *dst, struct cl_page_list *src,
        ++dst->pl_nr;
        lu_ref_set_at(&page->cp_reference, &page->cp_queue_ref, "queue",
                      src, dst);
-       EXIT;
 }
 EXPORT_SYMBOL(cl_page_list_move);
 
@@ -1135,7 +1123,6 @@ void cl_page_list_splice(struct cl_page_list *list, struct cl_page_list *head)
 
        cl_page_list_for_each_safe(page, tmp, list)
                cl_page_list_move(head, list, page);
-       EXIT;
 }
 EXPORT_SYMBOL(cl_page_list_splice);
 
@@ -1174,7 +1161,6 @@ void cl_page_list_disown(const struct lu_env *env,
                              plist);
                cl_page_put(env, page);
        }
-       EXIT;
 }
 EXPORT_SYMBOL(cl_page_list_disown);
 
@@ -1191,7 +1177,6 @@ void cl_page_list_fini(const struct lu_env *env, struct cl_page_list *plist)
        cl_page_list_for_each_safe(page, temp, plist)
                cl_page_list_del(env, plist, page);
        LASSERT(plist->pl_nr == 0);
-       EXIT;
 }
 EXPORT_SYMBOL(cl_page_list_fini);
 
@@ -1217,7 +1202,7 @@ int cl_page_list_own(const struct lu_env *env,
                else
                        cl_page_list_del(env, plist, page);
        }
-       RETURN(result);
+       return result;
 }
 EXPORT_SYMBOL(cl_page_list_own);
 
@@ -1247,7 +1232,6 @@ void cl_page_list_discard(const struct lu_env *env, struct cl_io *io,
        LINVRNT(plist->pl_owner == current);
        cl_page_list_for_each(page, plist)
                cl_page_discard(env, io, page);
-       EXIT;
 }
 EXPORT_SYMBOL(cl_page_list_discard);
 
@@ -1267,7 +1251,7 @@ int cl_page_list_unmap(const struct lu_env *env, struct cl_io *io,
                if (result != 0)
                        break;
        }
-       RETURN(result);
+       return result;
 }
 EXPORT_SYMBOL(cl_page_list_unmap);
 
@@ -1278,7 +1262,6 @@ void cl_2queue_init(struct cl_2queue *queue)
 {
        cl_page_list_init(&queue->c2_qin);
        cl_page_list_init(&queue->c2_qout);
-       EXIT;
 }
 EXPORT_SYMBOL(cl_2queue_init);
 
@@ -1288,7 +1271,6 @@ EXPORT_SYMBOL(cl_2queue_init);
 void cl_2queue_add(struct cl_2queue *queue, struct cl_page *page)
 {
        cl_page_list_add(&queue->c2_qin, page);
-       EXIT;
 }
 EXPORT_SYMBOL(cl_2queue_add);
 
@@ -1300,7 +1282,6 @@ void cl_2queue_disown(const struct lu_env *env,
 {
        cl_page_list_disown(env, io, &queue->c2_qin);
        cl_page_list_disown(env, io, &queue->c2_qout);
-       EXIT;
 }
 EXPORT_SYMBOL(cl_2queue_disown);
 
@@ -1312,7 +1293,6 @@ void cl_2queue_discard(const struct lu_env *env,
 {
        cl_page_list_discard(env, io, &queue->c2_qin);
        cl_page_list_discard(env, io, &queue->c2_qout);
-       EXIT;
 }
 EXPORT_SYMBOL(cl_2queue_discard);
 
@@ -1334,7 +1314,6 @@ void cl_2queue_fini(const struct lu_env *env, struct cl_2queue *queue)
 {
        cl_page_list_fini(env, &queue->c2_qout);
        cl_page_list_fini(env, &queue->c2_qin);
-       EXIT;
 }
 EXPORT_SYMBOL(cl_2queue_fini);
 
@@ -1345,7 +1324,6 @@ void cl_2queue_init_page(struct cl_2queue *queue, struct cl_page *page)
 {
        cl_2queue_init(queue);
        cl_2queue_add(queue, page);
-       EXIT;
 }
 EXPORT_SYMBOL(cl_2queue_init_page);
 
@@ -1358,7 +1336,7 @@ struct cl_io *cl_io_top(struct cl_io *io)
 {
        while (io->ci_parent != NULL)
                io = io->ci_parent;
-       RETURN(io);
+       return io;
 }
 EXPORT_SYMBOL(cl_io_top);
 
@@ -1387,7 +1365,6 @@ void cl_req_slice_add(struct cl_req *req, struct cl_req_slice *slice,
        slice->crs_dev = dev;
        slice->crs_ops = ops;
        slice->crs_req = req;
-       EXIT;
 }
 EXPORT_SYMBOL(cl_req_slice_add);
 
@@ -1413,7 +1390,6 @@ static void cl_req_free(const struct lu_env *env, struct cl_req *req)
                OBD_FREE(req->crq_o, req->crq_nrobjs * sizeof req->crq_o[0]);
        }
        OBD_FREE_PTR(req);
-       EXIT;
 }
 
 static int cl_req_init(const struct lu_env *env, struct cl_req *req,
@@ -1437,7 +1413,7 @@ static int cl_req_init(const struct lu_env *env, struct cl_req *req,
                }
                page = page->cp_child;
        } while (page != NULL && result == 0);
-       RETURN(result);
+       return result;
 }
 
 /**
@@ -1459,7 +1435,6 @@ void cl_req_completion(const struct lu_env *env, struct cl_req *req, int rc)
                        slice->crs_ops->cro_completion(env, slice, rc);
        }
        cl_req_free(env, req);
-       EXIT;
 }
 EXPORT_SYMBOL(cl_req_completion);
 
@@ -1492,7 +1467,7 @@ struct cl_req *cl_req_alloc(const struct lu_env *env, struct cl_page *page,
                }
        } else
                req = ERR_PTR(-ENOMEM);
-       RETURN(req);
+       return req;
 }
 EXPORT_SYMBOL(cl_req_alloc);
 
@@ -1528,7 +1503,6 @@ void cl_req_page_add(const struct lu_env *env,
                }
        }
        LASSERT(i < req->crq_nrobjs);
-       EXIT;
 }
 EXPORT_SYMBOL(cl_req_page_add);
 
@@ -1547,7 +1521,6 @@ void cl_req_page_done(const struct lu_env *env, struct cl_page *page)
        list_del_init(&page->cp_flight);
        --req->crq_nrpages;
        page->cp_req = NULL;
-       EXIT;
 }
 EXPORT_SYMBOL(cl_req_page_done);
 
@@ -1576,7 +1549,7 @@ int cl_req_prep(const struct lu_env *env, struct cl_req *req)
                                break;
                }
        }
-       RETURN(result);
+       return result;
 }
 EXPORT_SYMBOL(cl_req_prep);
 
@@ -1611,7 +1584,6 @@ void cl_req_attr_set(const struct lu_env *env, struct cl_req *req,
                                                             attr + i, flags);
                }
        }
-       EXIT;
 }
 EXPORT_SYMBOL(cl_req_attr_set);
 
@@ -1628,7 +1600,6 @@ void cl_sync_io_init(struct cl_sync_io *anchor, int nrpages)
        atomic_set(&anchor->csi_sync_nr, nrpages);
        atomic_set(&anchor->csi_barrier, nrpages > 0);
        anchor->csi_sync_rc = 0;
-       EXIT;
 }
 EXPORT_SYMBOL(cl_sync_io_init);
 
@@ -1672,7 +1643,7 @@ int cl_sync_io_wait(const struct lu_env *env, struct cl_io *io,
        }
 
        POISON(anchor, 0x5a, sizeof *anchor);
-       RETURN(rc);
+       return rc;
 }
 EXPORT_SYMBOL(cl_sync_io_wait);
 
@@ -1694,6 +1665,5 @@ void cl_sync_io_note(struct cl_sync_io *anchor, int ioret)
                /* it's safe to nuke or reuse anchor now */
                atomic_set(&anchor->csi_barrier, 0);
        }
-       EXIT;
 }
 EXPORT_SYMBOL(cl_sync_io_note);