Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e05e02e4 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 29aaf496

drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h

+0 −6
Original line number Diff line number Diff line
@@ -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)));

drivers/staging/lustre/lustre/llite/dcache.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/lustre/lustre/llite/statahead.c

+7 −7
Original line number Diff line number Diff line
@@ -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,

drivers/staging/lustre/lustre/lov/lov_io.c

+0 −1
Original line number Diff line number Diff line
@@ -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 = {

drivers/staging/lustre/lustre/mgc/mgc_request.c

+1 −1
Original line number Diff line number Diff line
@@ -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);