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

Commit f9e8f9bf authored by Aastha Gupta's avatar Aastha Gupta Committed by Greg Kroah-Hartman
Browse files

staging: lustre: ldlm: fix lines over 80 characters in ldlm files 



This patch fixes checkpatch.pl warning:

WARNING: line over 80 characters

Signed-off-by: default avatarAastha Gupta <aastha.gupta4104@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7b33d0a1

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

+2 −1
Original line number Diff line number Diff line
@@ -207,7 +207,8 @@ void ldlm_extent_add_lock(struct ldlm_resource *res, 
				continue;

			if (ldlm_extent_overlap(&lck->l_req_extent,

						&lock->l_req_extent)) {

				CDEBUG(D_ERROR, "granting conflicting lock %p %p\n",

				CDEBUG(D_ERROR,

				       "granting conflicting lock %p %p\n",

				       lck, lock);

				ldlm_resource_dump(D_ERROR, res);

				LBUG();

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

+4 −2
Original line number Diff line number Diff line
@@ -479,7 +479,8 @@ ldlm_flock_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data) 
		return 0;

	}



	LDLM_DEBUG(lock, "client-side enqueue returned a blocked lock, sleeping");

	LDLM_DEBUG(lock,

		   "client-side enqueue returned a blocked lock, sleeping");

	fwd.fwd_lock = lock;

	obd = class_exp2obd(lock->l_conn_export);
@@ -561,7 +562,8 @@ ldlm_flock_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data) 
			mode = lock->l_granted_mode;



		if (ldlm_is_flock_deadlock(lock)) {

			LDLM_DEBUG(lock, "client-side enqueue deadlock received");

			LDLM_DEBUG(lock,

				   "client-side enqueue deadlock received");

			rc = -EDEADLK;

		}

		ldlm_flock_destroy(lock, mode, LDLM_FL_WAIT_NOREPROC);

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

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ struct ldlm_namespace *ldlm_namespace_first_locked(enum ldlm_side client); 
/* ldlm_request.c */

/* Cancel lru flag, it indicates we cancel aged locks. */

enum {

	LDLM_LRU_FLAG_AGED	= BIT(0), /* Cancel aged locks (non lru resize). */

	LDLM_LRU_FLAG_AGED	= BIT(0), /* Cancel old non-LRU resize locks */

	LDLM_LRU_FLAG_PASSED	= BIT(1), /* Cancel passed number of locks. */

	LDLM_LRU_FLAG_SHRINK	= BIT(2), /* Cancel locks from shrinker. */

	LDLM_LRU_FLAG_LRUR	= BIT(3), /* Cancel locks from lru resize. */

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

+22 −11
Original line number Diff line number Diff line
@@ -1035,7 +1035,8 @@ void ldlm_grant_lock(struct ldlm_lock *lock, struct list_head *work_list) 
		ldlm_extent_add_lock(res, lock);

	} else if (res->lr_type == LDLM_FLOCK) {

		/*

		 * We should not add locks to granted list in the following cases:

		 * We should not add locks to granted list in

		 * the following cases:

		 * - this is an UNLOCK but not a real lock;

		 * - this is a TEST lock;

		 * - this is a F_CANCELLK lock (async flock has req_mode == 0)
@@ -2051,13 +2052,16 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, 
		libcfs_debug_vmsg2(msgdata, fmt, args,

				   " ns: \?\? lock: %p/%#llx lrc: %d/%d,%d mode: %s/%s res: \?\? rrc=\?\? type: \?\?\? flags: %#llx nid: %s remote: %#llx expref: %d pid: %u timeout: %lu lvb_type: %d\n",

				   lock,

				   lock->l_handle.h_cookie, atomic_read(&lock->l_refc),

				   lock->l_handle.h_cookie,

				   atomic_read(&lock->l_refc),

				   lock->l_readers, lock->l_writers,

				   ldlm_lockname[lock->l_granted_mode],

				   ldlm_lockname[lock->l_req_mode],

				   lock->l_flags, nid, lock->l_remote_handle.cookie,

				   lock->l_flags, nid,

				   lock->l_remote_handle.cookie,

				   exp ? atomic_read(&exp->exp_refcount) : -99,

				   lock->l_pid, lock->l_callback_timeout, lock->l_lvb_type);

				   lock->l_pid, lock->l_callback_timeout,

				   lock->l_lvb_type);

		va_end(args);

		return;

	}
@@ -2067,7 +2071,8 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, 
		libcfs_debug_vmsg2(msgdata, fmt, args,

				   " ns: %s lock: %p/%#llx lrc: %d/%d,%d mode: %s/%s res: " DLDLMRES " rrc: %d type: %s [%llu->%llu] (req %llu->%llu) flags: %#llx nid: %s remote: %#llx expref: %d pid: %u timeout: %lu lvb_type: %d\n",

				   ldlm_lock_to_ns_name(lock), lock,

				   lock->l_handle.h_cookie, atomic_read(&lock->l_refc),

				   lock->l_handle.h_cookie,

				   atomic_read(&lock->l_refc),

				   lock->l_readers, lock->l_writers,

				   ldlm_lockname[lock->l_granted_mode],

				   ldlm_lockname[lock->l_req_mode],
@@ -2076,8 +2081,10 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, 
				   ldlm_typename[resource->lr_type],

				   lock->l_policy_data.l_extent.start,

				   lock->l_policy_data.l_extent.end,

				   lock->l_req_extent.start, lock->l_req_extent.end,

				   lock->l_flags, nid, lock->l_remote_handle.cookie,

				   lock->l_req_extent.start,

				   lock->l_req_extent.end,

				   lock->l_flags, nid,

				   lock->l_remote_handle.cookie,

				   exp ? atomic_read(&exp->exp_refcount) : -99,

				   lock->l_pid, lock->l_callback_timeout,

				   lock->l_lvb_type);
@@ -2087,7 +2094,8 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, 
		libcfs_debug_vmsg2(msgdata, fmt, args,

				   " ns: %s lock: %p/%#llx lrc: %d/%d,%d mode: %s/%s res: " DLDLMRES " rrc: %d type: %s pid: %d [%llu->%llu] flags: %#llx nid: %s remote: %#llx expref: %d pid: %u timeout: %lu\n",

				   ldlm_lock_to_ns_name(lock), lock,

				   lock->l_handle.h_cookie, atomic_read(&lock->l_refc),

				   lock->l_handle.h_cookie,

				   atomic_read(&lock->l_refc),

				   lock->l_readers, lock->l_writers,

				   ldlm_lockname[lock->l_granted_mode],

				   ldlm_lockname[lock->l_req_mode],
@@ -2097,7 +2105,8 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, 
				   lock->l_policy_data.l_flock.pid,

				   lock->l_policy_data.l_flock.start,

				   lock->l_policy_data.l_flock.end,

				   lock->l_flags, nid, lock->l_remote_handle.cookie,

				   lock->l_flags, nid,

				   lock->l_remote_handle.cookie,

				   exp ? atomic_read(&exp->exp_refcount) : -99,

				   lock->l_pid, lock->l_callback_timeout);

		break;
@@ -2115,7 +2124,8 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, 
				   lock->l_policy_data.l_inodebits.bits,

				   atomic_read(&resource->lr_refcount),

				   ldlm_typename[resource->lr_type],

				   lock->l_flags, nid, lock->l_remote_handle.cookie,

				   lock->l_flags, nid,

				   lock->l_remote_handle.cookie,

				   exp ? atomic_read(&exp->exp_refcount) : -99,

				   lock->l_pid, lock->l_callback_timeout,

				   lock->l_lvb_type);
@@ -2133,7 +2143,8 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, 
				   PLDLMRES(resource),

				   atomic_read(&resource->lr_refcount),

				   ldlm_typename[resource->lr_type],

				   lock->l_flags, nid, lock->l_remote_handle.cookie,

				   lock->l_flags, nid,

				   lock->l_remote_handle.cookie,

				   exp ? atomic_read(&exp->exp_refcount) : -99,

				   lock->l_pid, lock->l_callback_timeout,

				   lock->l_lvb_type);

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

+4 −2
Original line number Diff line number Diff line
@@ -184,7 +184,8 @@ static void ldlm_handle_cp_callback(struct ptlrpc_request *req, 
			LASSERT(lock->l_lvb_data);



			if (unlikely(lock->l_lvb_len < lvb_len)) {

				LDLM_ERROR(lock, "Replied LVB is larger than expectation, expected = %d, replied = %d",

				LDLM_ERROR(lock,

					   "Replied LVB is larger than expectation, expected = %d, replied = %d",

					   lock->l_lvb_len, lvb_len);

				rc = -EINVAL;

				goto out;
@@ -598,7 +599,8 @@ static int ldlm_callback_handler(struct ptlrpc_request *req) 


	lock = ldlm_handle2lock_long(&dlm_req->lock_handle[0], 0);

	if (!lock) {

		CDEBUG(D_DLMTRACE, "callback on lock %#llx - lock disappeared\n",

		CDEBUG(D_DLMTRACE,

		       "callback on lock %#llx - lock disappeared\n",

		       dlm_req->lock_handle[0].cookie);

		rc = ldlm_callback_reply(req, -EINVAL);

		ldlm_callback_errmsg(req, "Operate with invalid parameter", rc,