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

Commit a3fbcb3c authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman
Browse files

staging/lustre/libcfs: Update comments style to match kernel 



checkpatch complains that the trailing */ on the multiline comments
should be on it's own line.

Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 69c7c854

drivers/staging/lustre/lustre/libcfs/debug.c

+9 −9
Original line number Diff line number Diff line
@@ -82,7 +82,8 @@ static int libcfs_param_debug_mb_set(const char *val, 


/* While debug_mb setting look like unsigned int, in fact

 * it needs quite a bunch of extra processing, so we define special

 * debugmb parameter type with corresponding methods to handle this case */

 * debugmb parameter type with corresponding methods to handle this case

 */

static struct kernel_param_ops param_ops_debugmb = {

	.set = libcfs_param_debug_mb_set,

	.get = param_get_uint,
@@ -227,8 +228,7 @@ MODULE_PARM_DESC(libcfs_debug_file_path, 


int libcfs_panic_in_progress;



/* libcfs_debug_token2mask() expects the returned

 * string in lower-case */

/* libcfs_debug_token2mask() expects the returned string in lower-case */

static const char *

libcfs_debug_subsys2str(int subsys)

{
@@ -290,8 +290,7 @@ libcfs_debug_subsys2str(int subsys) 
	}

}



/* libcfs_debug_token2mask() expects the returned

 * string in lower-case */

/* libcfs_debug_token2mask() expects the returned string in lower-case */

static const char *

libcfs_debug_dbg2str(int debug)

{
@@ -470,7 +469,8 @@ void libcfs_debug_dumplog(void) 


	/* we're being careful to ensure that the kernel thread is

	 * able to set our state to running as it exits before we

	 * get to schedule() */

	 * get to schedule()

	 */

	init_waitqueue_entry(&wait, current);

	set_current_state(TASK_INTERRUPTIBLE);

	add_wait_queue(&debug_ctlwq, &wait);
@@ -511,7 +511,8 @@ int libcfs_debug_init(unsigned long bufsize) 
	}



	/* If libcfs_debug_mb is set to an invalid value or uninitialized

	 * then just make the total buffers smp_num_cpus * TCD_MAX_PAGES */

	 * then just make the total buffers smp_num_cpus * TCD_MAX_PAGES

	 */

	if (max > cfs_trace_max_debug_mb() || max < num_possible_cpus()) {

		max = TCD_MAX_PAGES;

	} else {
@@ -541,8 +542,7 @@ int libcfs_debug_clear_buffer(void) 
	return 0;

}



/* Debug markers, although printed by S_LNET

 * should not be be marked as such. */

/* Debug markers, although printed by S_LNET should not be be marked as such. */

#undef DEBUG_SUBSYSTEM

#define DEBUG_SUBSYSTEM S_UNDEFINED

int libcfs_debug_mark_buffer(const char *text)

drivers/staging/lustre/lustre/libcfs/fail.c

+2 −1
Original line number Diff line number Diff line
@@ -97,7 +97,8 @@ int __cfs_fail_check_set(__u32 id, __u32 value, int set) 
	/* Lost race to set CFS_FAILED_BIT. */

	if (test_and_set_bit(CFS_FAILED_BIT, &cfs_fail_loc)) {

		/* If CFS_FAIL_ONCE is valid, only one process can fail,

		 * otherwise multi-process can fail at the same time. */

		 * otherwise multi-process can fail at the same time.

		 */

		if (cfs_fail_loc & CFS_FAIL_ONCE)

			return 0;

	}

drivers/staging/lustre/lustre/libcfs/hash.c

+12 −6
Original line number Diff line number Diff line
@@ -579,7 +579,8 @@ cfs_hash_bd_move_locked(struct cfs_hash *hs, struct cfs_hash_bd *bd_old, 
		return;



	/* use cfs_hash_bd_hnode_add/del, to avoid atomic & refcount ops

	 * in cfs_hash_bd_del/add_locked */

	 * in cfs_hash_bd_del/add_locked

	 */

	hs->hs_hops->hop_hnode_del(hs, bd_old, hnode);

	rc = hs->hs_hops->hop_hnode_add(hs, bd_new, hnode);

	cfs_hash_bd_dep_record(hs, bd_new, rc);
@@ -635,7 +636,8 @@ cfs_hash_bd_lookup_intent(struct cfs_hash *hs, struct cfs_hash_bd *bd, 
	int intent_add = (intent & CFS_HS_LOOKUP_MASK_ADD) != 0;



	/* with this function, we can avoid a lot of useless refcount ops,

	 * which are expensive atomic operations most time. */

	 * which are expensive atomic operations most time.

	 */

	match = intent_add ? NULL : hnode;

	hlist_for_each(ehnode, hhead) {

		if (!cfs_hash_keycmp(hs, key, ehnode))
@@ -1109,7 +1111,8 @@ cfs_hash_destroy(struct cfs_hash *hs) 
					 hs->hs_name, bd.bd_bucket->hsb_index,

					 bd.bd_offset, bd.bd_bucket->hsb_count);

				/* can't assert key valicate, because we

				 * can interrupt rehash */

				 * can interrupt rehash

				 */

				cfs_hash_bd_del_locked(hs, &bd, hnode);

				cfs_hash_exit(hs, hnode);

			}
@@ -1160,7 +1163,8 @@ cfs_hash_rehash_bits(struct cfs_hash *hs) 
		return -EAGAIN;



	/* XXX: need to handle case with max_theta != 2.0

	 *      and the case with min_theta != 0.5 */

	 *      and the case with min_theta != 0.5

	 */

	if ((hs->hs_cur_bits < hs->hs_max_bits) &&

	    (__cfs_hash_theta(hs) > hs->hs_max_theta))

		return hs->hs_cur_bits + 1;
@@ -1374,7 +1378,8 @@ cfs_hash_for_each_enter(struct cfs_hash *hs) 
	/* NB: iteration is mostly called by service thread,

	 * we tend to cancel pending rehash-request, instead of

	 * blocking service thread, we will relaunch rehash request

	 * after iteration */

	 * after iteration

	 */

	if (cfs_hash_is_rehashing(hs))

		cfs_hash_rehash_cancel_locked(hs);

	cfs_hash_unlock(hs, 1);
@@ -1987,7 +1992,8 @@ void cfs_hash_rehash_key(struct cfs_hash *hs, const void *old_key, 
		cfs_hash_bd_add_locked(hs, &new_bd, hnode);

	}

	/* overwrite key inside locks, otherwise may screw up with

	 * other operations, i.e: rehash */

	 * other operations, i.e: rehash

	 */

	cfs_hash_keycpy(hs, hnode, new_key);



	cfs_hash_multi_bd_unlock(hs, bds, 3, 1);

drivers/staging/lustre/lustre/libcfs/libcfs_lock.c

+2 −1
Original line number Diff line number Diff line
@@ -110,7 +110,8 @@ cfs_percpt_lock(struct cfs_percpt_lock *pcl, int index) 
		if (i == 0) {

			LASSERT(!pcl->pcl_locked);

			/* nobody should take private lock after this

			 * so I wouldn't starve for too long time */

			 * so I wouldn't starve for too long time

			 */

			pcl->pcl_locked = 1;

		}

	}

drivers/staging/lustre/lustre/libcfs/libcfs_string.c

+2 −1
Original line number Diff line number Diff line
@@ -54,7 +54,8 @@ int cfs_str2mask(const char *str, const char *(*bit2str)(int bit), 
	 * and optionally an operator ('+' or '-').  If an operator

	 * appears first in <str>, '*oldmask' is used as the starting point

	 * (relative), otherwise minmask is used (absolute).  An operator

	 * applies to all following tokens up to the next operator. */

	 * applies to all following tokens up to the next operator.

	 */

	while (*str != '\0') {

		while (isspace(*str))

			str++;