Commit 902f3bb1 authored by Andreas Ruprecht's avatar Andreas Ruprecht Committed by Greg Kroah-Hartman
Browse files

staging: lustre: ldlm: Add missing newlines after declarations 



checkpatch.pl complains about a number of missing newlines after
declarations. This patch gets rid of these warnings.

Signed-off-by: default avatarAndreas Ruprecht <rupran@einserver.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ce6bed69

drivers/staging/lustre/lustre/ldlm/interval_tree.c

+5 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ static inline int extent_compare(struct interval_node_extent *e1, 
				 struct interval_node_extent *e2)

{

	int rc;



	if (e1->start == e2->start) {

		if (e1->end < e2->end)

			rc = -1;
@@ -321,6 +322,7 @@ static void interval_insert_color(struct interval_node *node, 
		/* Parent is RED, so gparent must not be NULL */

		if (node_is_left_child(parent)) {

			struct interval_node *uncle;



			uncle = gparent->in_right;

			if (uncle && node_is_red(uncle)) {

				uncle->in_color = INTERVAL_BLACK;
@@ -340,6 +342,7 @@ static void interval_insert_color(struct interval_node *node, 
			__rotate_right(gparent, root);

		} else {

			struct interval_node *uncle;



			uncle = gparent->in_left;

			if (uncle && node_is_red(uncle)) {

				uncle->in_color = INTERVAL_BLACK;
@@ -427,6 +430,7 @@ static void interval_erase_color(struct interval_node *node, 
			} else {

				if (node_is_black_or_0(tmp->in_right)) {

					struct interval_node *o_left;



					o_left = tmp->in_left;

					if (o_left)

						o_left->in_color = INTERVAL_BLACK;
@@ -458,6 +462,7 @@ static void interval_erase_color(struct interval_node *node, 
			} else {

				if (node_is_black_or_0(tmp->in_left)) {

					struct interval_node *o_right;



					o_right = tmp->in_right;

					if (o_right)

						o_right->in_color = INTERVAL_BLACK;

drivers/staging/lustre/lustre/ldlm/ldlm_extent.c

+3 −1
Original line number Diff line number Diff line
@@ -182,7 +182,9 @@ void ldlm_extent_add_lock(struct ldlm_resource *res, 
	root = &res->lr_itree[idx].lit_root;

	found = interval_insert(&node->li_node, root);

	if (found) { /* The policy group found. */

		struct ldlm_interval *tmp = ldlm_interval_detach(lock);

		struct ldlm_interval *tmp;



		tmp = ldlm_interval_detach(lock);

		LASSERT(tmp != NULL);

		ldlm_interval_free(tmp);

		ldlm_interval_attach(to_ldlm_interval(found), lock);

drivers/staging/lustre/lustre/ldlm/ldlm_flock.c

+1 −0
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@ ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, int first_enq, 
		}

	} else {

		int reprocess_failed = 0;



		lockmode_verify(mode);



		/* This loop determines if there are existing locks

drivers/staging/lustre/lustre/ldlm/ldlm_internal.h

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ static inline struct ldlm_extent * 
ldlm_interval_extent(struct ldlm_interval *node)

{

	struct ldlm_lock *lock;



	LASSERT(!list_empty(&node->li_group));



	lock = list_entry(node->li_group.next, struct ldlm_lock,

drivers/staging/lustre/lustre/ldlm/ldlm_lock.c

+4 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ EXPORT_SYMBOL(ldlm_lock_put); 
int ldlm_lock_remove_from_lru_nolock(struct ldlm_lock *lock)

{

	int rc = 0;



	if (!list_empty(&lock->l_lru)) {

		struct ldlm_namespace *ns = ldlm_lock_to_ns(lock);
@@ -858,6 +859,7 @@ void ldlm_lock_decref_internal(struct ldlm_lock *lock, __u32 mode) 
void ldlm_lock_decref(struct lustre_handle *lockh, __u32 mode)

{

	struct ldlm_lock *lock = __ldlm_handle2lock(lockh, 0);



	LASSERTF(lock != NULL, "Non-existing lock: %#llx\n", lockh->cookie);

	ldlm_lock_decref_internal(lock, mode);

	LDLM_LOCK_PUT(lock);
@@ -1286,6 +1288,7 @@ ldlm_mode_t ldlm_lock_match(struct ldlm_namespace *ns, __u64 flags, 
			__u64 wait_flags = LDLM_FL_LVB_READY |

				LDLM_FL_DESTROYED | LDLM_FL_FAIL_NOTIFIED;

			struct l_wait_info lwi;



			if (lock->l_completion_ast) {

				int err = lock->l_completion_ast(lock,

							  LDLM_FL_WAIT_NOREPROC,
@@ -2219,6 +2222,7 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, 
		nid = libcfs_nid2str(exp->exp_connection->c_peer.nid);

	} else if (exp && exp->exp_obd != NULL) {

		struct obd_import *imp = exp->exp_obd->u.cli.cl_import;



		nid = libcfs_nid2str(imp->imp_connection->c_peer.nid);

	}