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

Commit 6e3dd654 authored by Masanari Iida's avatar Masanari Iida Committed by Greg Kroah-Hartman
Browse files

staging: lustre: Fix typo in lustre/lustre/fld and ldlm 



Correct spelling typo in luster/lustre/fld and ldlm.

Signed-off-by: default avatarMasanari Iida <standby24x7@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 11d66e89

drivers/staging/lustre/lustre/fld/fld_cache.c

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ static void fld_cache_overlap_handle(struct fld_cache *cache, 
	const mdsno_t mdt = range->lsr_index;



	/* this is overlap case, these case are checking overlapping with

	 * prev range only. fixup will handle overlaping with next range. */

	 * prev range only. fixup will handle overlapping with next range. */



	if (f_curr->fce_range.lsr_index == mdt) {

		f_curr->fce_range.lsr_start = min(f_curr->fce_range.lsr_start,

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

+4 −4
Original line number Diff line number Diff line
@@ -801,7 +801,7 @@ void ldlm_lock_addref_internal(struct ldlm_lock *lock, __u32 mode) 
 * Removes reader/writer reference for LDLM lock \a lock.

 * Assumes LDLM lock is already locked.

 * only called in ldlm_flock_destroy and for local locks.

 * Does NOT add lock to LRU if no r/w references left to accomodate flock locks

 * Does NOT add lock to LRU if no r/w references left to accommodate flock locks

 * that cannot be placed in LRU.

 */

void ldlm_lock_decref_internal_nolock(struct ldlm_lock *lock, __u32 mode)
@@ -1254,7 +1254,7 @@ EXPORT_SYMBOL(ldlm_lock_allow_match); 
 *     list will be considered

 * If 'flags' contains LDLM_FL_CBPENDING, then locks that have been marked

 *     to be canceled can still be matched as long as they still have reader

 *     or writer refernces

 *     or writer referneces

 * If 'flags' contains LDLM_FL_TEST_LOCK, then don't actually reference a lock,

 *     just tell us if we would have matched.

 *
@@ -2097,8 +2097,8 @@ void ldlm_cancel_locks_for_export(struct obd_export *exp) 
/**

 * Downgrade an exclusive lock.

 *

 * A fast variant of ldlm_lock_convert for convertion of exclusive

 * locks. The convertion is always successful.

 * A fast variant of ldlm_lock_convert for conversion of exclusive

 * locks. The conversion is always successful.

 * Used by Commit on Sharing (COS) code.

 *

 * \param lock A lock to convert

drivers/staging/lustre/lustre/ldlm/ldlm_request.c

+3 −3
Original line number Diff line number Diff line
@@ -781,7 +781,7 @@ int ldlm_prep_elc_req(struct obd_export *exp, struct ptlrpc_request *req, 
			dlm = req_capsule_client_get(pill, &RMF_DLM_REQ);

			LASSERT(dlm);

			/* Skip first lock handler in ldlm_request_pack(),

			 * this method will incrment @lock_count according

			 * this method will increment @lock_count according

			 * to the lock handle amount actually written to

			 * the buffer. */

			dlm->lock_count = canceloff;
@@ -1584,7 +1584,7 @@ ldlm_cancel_lru_policy(struct ldlm_namespace *ns, int flags) 
 *			      the beginning of LRU list);

 *

 * flags & LDLM_CANCEL_SHRINK - cancel not more than \a count locks according to

 *			      memory pressre policy function;

 *			      memory pressure policy function;

 *

 * flags & LDLM_CANCEL_AGED - cancel \a count locks according to "aged policy".

 *
@@ -2076,7 +2076,7 @@ static int ldlm_chain_lock_for_replay(struct ldlm_lock *lock, void *closure) 
		 lock, &lock->l_pending_chain.next,&lock->l_pending_chain.prev);

	/* bug 9573: don't replay locks left after eviction, or

	 * bug 17614: locks being actively cancelled. Get a reference

	 * on a lock so that it does not disapear under us (e.g. due to cancel)

	 * on a lock so that it does not disappear under us (e.g. due to cancel)

	 */

	if (!(lock->l_flags & (LDLM_FL_FAILED|LDLM_FL_CANCELING))) {

		list_add(&lock->l_pending_chain, list);

drivers/staging/lustre/lustre/ldlm/ldlm_resource.c

+2 −2
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static int lprocfs_ns_resources_seq_show(struct seq_file *m, void *v) 
	struct cfs_hash_bd	  bd;

	int		    i;



	/* result is not strictly consistant */

	/* result is not strictly consistent */

	cfs_hash_for_each_bucket(ns->ns_rs_hash, &bd, i)

		res += cfs_hash_bd_count_get(&bd);

	return lprocfs_rd_u64(m, &res);
@@ -874,7 +874,7 @@ void ldlm_namespace_free_prior(struct ldlm_namespace *ns, 


		/*

		 * With all requests dropped and the import inactive

		 * we are gaurenteed all reference will be dropped.

		 * we are guaranteed all reference will be dropped.

		 */

		rc = __ldlm_namespace_free(ns, 1);

		LASSERT(rc == 0);