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

staging: lustre: ldlm: Fix overlong lines 



checkpatch complains about a number of lines which are over the
80 character line limit. This patch changes most of them to comply,
the few remaining lines with warnings are not changed for readability
reasons.

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

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

+4 −2
Original line number Diff line number Diff line
@@ -260,7 +260,8 @@ ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, int first_enq, 
	int splitted = 0;

	const struct ldlm_callback_suite null_cbs = { NULL };



	CDEBUG(D_DLMTRACE, "flags %#llx owner %llu pid %u mode %u start %llu end %llu\n",

	CDEBUG(D_DLMTRACE,

	       "flags %#llx owner %llu pid %u mode %u start %llu end %llu\n",

	       *flags, new->l_policy_data.l_flock.owner,

	       new->l_policy_data.l_flock.pid, mode,

	       req->l_policy_data.l_flock.start,
@@ -497,7 +498,8 @@ ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, int first_enq, 
			new->l_policy_data.l_flock.end + 1;

		new2->l_conn_export = lock->l_conn_export;

		if (lock->l_export != NULL) {

			new2->l_export = class_export_lock_get(lock->l_export, new2);

			new2->l_export = class_export_lock_get(lock->l_export,

							       new2);

			if (new2->l_export->exp_lock_hash &&

			    hlist_unhashed(&new2->l_exp_hash))

				cfs_hash_add(new2->l_export->exp_lock_hash,

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

+2 −1
Original line number Diff line number Diff line
@@ -91,7 +91,8 @@ static inline int ldlm_ns_empty(struct ldlm_namespace *ns) 
}



void ldlm_namespace_move_to_active_locked(struct ldlm_namespace *, ldlm_side_t);

void ldlm_namespace_move_to_inactive_locked(struct ldlm_namespace *, ldlm_side_t);

void ldlm_namespace_move_to_inactive_locked(struct ldlm_namespace *,

					    ldlm_side_t);

struct ldlm_namespace *ldlm_namespace_first_locked(ldlm_side_t);



/* ldlm_request.c */

drivers/staging/lustre/lustre/ldlm/ldlm_lib.c

+2 −1
Original line number Diff line number Diff line
@@ -603,7 +603,8 @@ int client_disconnect_export(struct obd_export *exp) 
		/* obd_force == local only */

		ldlm_cli_cancel_unused(obd->obd_namespace, NULL,

				       obd->obd_force ? LCF_LOCAL : 0, NULL);

		ldlm_namespace_free_prior(obd->obd_namespace, imp, obd->obd_force);

		ldlm_namespace_free_prior(obd->obd_namespace, imp,

					  obd->obd_force);

	}



	/* There's no need to hold sem while disconnecting an import,

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

+4 −2
Original line number Diff line number Diff line
@@ -1342,7 +1342,8 @@ ldlm_mode_t ldlm_lock_match(struct ldlm_namespace *ns, __u64 flags, 


	} else if (!(flags & LDLM_FL_TEST_LOCK)) {/*less verbose for test-only*/

		LDLM_DEBUG_NOLOCK("not matched ns %p type %u mode %u res %llu/%llu (%llu %llu)",

				  ns, type, mode, res_id->name[0], res_id->name[1],

				  ns, type, mode, res_id->name[0],

				  res_id->name[1],

				  (type == LDLM_PLAIN || type == LDLM_IBITS) ?

					res_id->name[2] :policy->l_extent.start,

				  (type == LDLM_PLAIN || type == LDLM_IBITS) ?
@@ -1455,7 +1456,8 @@ int ldlm_fill_lvb(struct ldlm_lock *lock, struct req_capsule *pill, 


			memcpy(data, lvb, size);

		} else {

			LDLM_ERROR(lock, "Replied unexpected lquota LVB size %d",

			LDLM_ERROR(lock,

				   "Replied unexpected lquota LVB size %d",

				   size);

			return -EINVAL;

		}

drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c

+5 −3
Original line number Diff line number Diff line
@@ -158,13 +158,15 @@ void ldlm_handle_bl_callback(struct ldlm_namespace *ns, 
	unlock_res_and_lock(lock);



	if (do_ast) {

		CDEBUG(D_DLMTRACE, "Lock %p already unused, calling callback (%p)\n",

		       lock, lock->l_blocking_ast);

		CDEBUG(D_DLMTRACE,

		       "Lock %p already unused, calling callback (%p)\n", lock,

		       lock->l_blocking_ast);

		if (lock->l_blocking_ast != NULL)

			lock->l_blocking_ast(lock, ld, lock->l_ast_data,

					     LDLM_CB_BLOCKING);

	} else {

		CDEBUG(D_DLMTRACE, "Lock %p is referenced, will be cancelled later\n",

		CDEBUG(D_DLMTRACE,

		       "Lock %p is referenced, will be cancelled later\n",

		       lock);

	}