staging: lustre: remove RETURN_EXIT macro

We have a kernel-wide function tracing system, so use that instead of
rolling a custom one just for one filesystem.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
index feb7a6b..17189d9 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
@@ -314,12 +314,6 @@ do {                                                                   \
        CDEBUG(D_TRACE, "Process leaving\n");                      \
 } while(0)
 
-#define RETURN_EXIT                                                    \
-do {                                                                   \
-       EXIT;                                                           \
-       return;                                                         \
-} while (0)
-
 extern int libcfs_debug_msg(struct libcfs_debug_msg_data *msgdata,
                            const char *format1, ...)
        __attribute__ ((format (printf, 2, 3)));

diff --git a/drivers/staging/lustre/lustre/llite/dcache.c b/drivers/staging/lustre/lustre/llite/dcache.c
index 628fae4..484af85 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/dcache.c
+++ b/drivers/staging/lustre/lustre/llite/dcache.c
@@ -63,7 +63,7 @@ static void ll_release(struct dentry *de)
        LASSERT(de != NULL);
        lld = ll_d2d(de);
        if (lld == NULL) /* NFS copies the de->d_op methods (bug 4655) */
-               RETURN_EXIT;
+               return;
 
        if (lld->lld_it) {
                ll_intent_release(lld->lld_it);

diff --git a/drivers/staging/lustre/lustre/llite/statahead.c b/drivers/staging/lustre/lustre/llite/statahead.c
index be1c3a8..772e4ce 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/statahead.c
+++ b/drivers/staging/lustre/lustre/llite/statahead.c
@@ -516,7 +516,7 @@ static void ll_sai_put(struct ll_statahead_info *sai)
                        /* It is race case, the interpret callback just hold
                         * a reference count */
                        spin_unlock(&lli->lli_sa_lock);
-                       RETURN_EXIT;
+                       return;
                }
 
                LASSERT(lli->lli_opendir_key == NULL);
@@ -564,7 +564,7 @@ static void ll_agl_trigger(struct inode *inode, struct ll_statahead_info *sai)
        if (is_omitted_entry(sai, index + 1)) {
                lli->lli_agl_index = 0;
                iput(inode);
-               RETURN_EXIT;
+               return;
        }
 
        /* Someone is in glimpse (sync or async), do nothing. */
@@ -572,7 +572,7 @@ static void ll_agl_trigger(struct inode *inode, struct ll_statahead_info *sai)
        if (rc == 0) {
                lli->lli_agl_index = 0;
                iput(inode);
-               RETURN_EXIT;
+               return;
        }
 
        /*
@@ -593,7 +593,7 @@ static void ll_agl_trigger(struct inode *inode, struct ll_statahead_info *sai)
                up_write(&lli->lli_glimpse_sem);
                lli->lli_agl_index = 0;
                iput(inode);
-               RETURN_EXIT;
+               return;
        }
 
        CDEBUG(D_READA, "Handling (init) async glimpse: inode = "
@@ -628,7 +628,7 @@ static void ll_post_statahead(struct ll_statahead_info *sai)
        spin_lock(&lli->lli_sa_lock);
        if (unlikely(sa_received_empty(sai))) {
                spin_unlock(&lli->lli_sa_lock);
-               RETURN_EXIT;
+               return;
        }
        entry = sa_first_received_entry(sai);
        atomic_inc(&entry->se_refcount);
@@ -930,7 +930,7 @@ static void ll_statahead_one(struct dentry *parent, const char* entry_name,
        entry = ll_sa_entry_alloc(sai, sai->sai_index, entry_name,
                                  entry_name_len);
        if (IS_ERR(entry))
-               RETURN_EXIT;
+               return;
 
        dentry = d_lookup(parent, &entry->se_qstr);
        if (!dentry) {
@@ -1038,7 +1038,7 @@ static void ll_start_agl(struct dentry *parent, struct ll_statahead_info *sai)
        if (IS_ERR(task)) {
                CERROR("can't start ll_agl thread, rc: %ld\n", PTR_ERR(task));
                thread_set_flags(thread, SVC_STOPPED);
-               RETURN_EXIT;
+               return;
        }
 
        l_wait_event(thread->t_ctl_waitq,

diff --git a/drivers/staging/lustre/lustre/lov/lov_io.c b/drivers/staging/lustre/lustre/lov/lov_io.c
index 0ef2293..10e36c9 100644 (file)
--- a/drivers/staging/lustre/lustre/lov/lov_io.c
+++ b/drivers/staging/lustre/lustre/lov/lov_io.c
@@ -742,7 +742,6 @@ static void lov_io_fsync_end(const struct lu_env *env,
                if (subio->ci_result == 0)
                        *written += subio->u.ci_fsync.fi_nr_written;
        }
-       RETURN_EXIT;
 }
 
 static const struct cl_io_operations lov_io_ops = {

diff --git a/drivers/staging/lustre/lustre/mgc/mgc_request.c b/drivers/staging/lustre/lustre/mgc/mgc_request.c
index 0696815..6512b7f 100644 (file)
--- a/drivers/staging/lustre/lustre/mgc/mgc_request.c
+++ b/drivers/staging/lustre/lustre/mgc/mgc_request.c
@@ -561,7 +561,7 @@ static void mgc_requeue_add(struct config_llog_data *cld)
        mutex_lock(&cld->cld_lock);
        if (cld->cld_stopping || cld->cld_lostlock) {
                mutex_unlock(&cld->cld_lock);
-               RETURN_EXIT;
+               return;
        }
        /* this refcount will be released in mgc_requeue_thread. */
        config_log_get(cld);

diff --git a/drivers/staging/lustre/lustre/osc/osc_lock.c b/drivers/staging/lustre/lustre/osc/osc_lock.c
index a13215d..ef6f1bb 100644 (file)
--- a/drivers/staging/lustre/lustre/osc/osc_lock.c
+++ b/drivers/staging/lustre/lustre/osc/osc_lock.c
@@ -344,7 +344,7 @@ static void osc_lock_lvb_update(const struct lu_env *env, struct osc_lock *olck,
        unsigned           valid;
 
        if (!(olck->ols_flags & LDLM_FL_LVB_READY))
-               RETURN_EXIT;
+               return;
 
        lvb   = &olck->ols_lvb;
        obj   = olck->ols_cl.cls_obj;

diff --git a/drivers/staging/lustre/lustre/ptlrpc/nrs.c b/drivers/staging/lustre/lustre/ptlrpc/nrs.c
index 352c0f1..afc5232 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/nrs.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/nrs.c
@@ -158,11 +158,6 @@ static void nrs_policy_stop_primary(struct ptlrpc_nrs *nrs)
        struct ptlrpc_nrs_policy *tmp = nrs->nrs_policy_primary;
 
        if (tmp == NULL) {
-               /**
-                * XXX: This should really be RETURN_EXIT, but the latter does
-                * not currently print anything out, and possibly should be
-                * fixed to do so.
-                */
                EXIT;
                return;
        }

diff --git a/drivers/staging/lustre/lustre/ptlrpc/service.c b/drivers/staging/lustre/lustre/ptlrpc/service.c
index 68afbc5..1a73f8a 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/service.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/service.c
@@ -1043,7 +1043,7 @@ static void ptlrpc_update_export_timer(struct obd_export *exp, long extra_delay)
        /* Do not pay attention on 1sec or smaller renewals. */
        new_time = cfs_time_current_sec() + extra_delay;
        if (exp->exp_last_request_time + 1 /*second */ >= new_time)
-               RETURN_EXIT;
+               return;
 
        exp->exp_last_request_time = new_time;
        CDEBUG(D_HA, "updating export %s at "CFS_TIME_T" exp %p\n",
@@ -1058,7 +1058,7 @@ static void ptlrpc_update_export_timer(struct obd_export *exp, long extra_delay)
        if (list_empty(&exp->exp_obd_chain_timed)) {
                /* this one is not timed */
                spin_unlock(&exp->exp_obd->obd_dev_lock);
-               RETURN_EXIT;
+               return;
        }
 
        list_move_tail(&exp->exp_obd_chain_timed,