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

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

staging/lustre: Make alignment match open parenthesis 



This patch fixes most of checkpatch occurences of
"CHECK: Alignment should match open parenthesis"
in Lustre code.

Signed-off-by: default avatarEmoly Liu <emoly.liu@intel.com>
Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cd94f231

drivers/staging/lustre/include/linux/libcfs/libcfs.h

+3 −3
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ void lustre_insert_debugfs(struct ctl_table *table, 
			   const struct lnet_debugfs_symlink_def *symlinks);

int lprocfs_call_handler(void *data, int write, loff_t *ppos,

			 void __user *buffer, size_t *lenp,

			  int (*handler)(void *data, int write,

			  loff_t pos, void __user *buffer, int len));

			 int (*handler)(void *data, int write, loff_t pos,

					void __user *buffer, int len));



#endif /* _LIBCFS_H */

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c

+3 −2
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ static void kiblnd_peer_connect_failed(struct kib_peer *peer, int active, int er 
static void kiblnd_init_tx_msg(lnet_ni_t *ni, struct kib_tx *tx,

			       int type, int body_nob);

static int kiblnd_init_rdma(struct kib_conn *conn, struct kib_tx *tx, int type,

			     int resid, struct kib_rdma_desc *dstrd, __u64 dstcookie);

			    int resid, struct kib_rdma_desc *dstrd,

			    __u64 dstcookie);

static void kiblnd_queue_tx_locked(struct kib_tx *tx, struct kib_conn *conn);

static void kiblnd_queue_tx(struct kib_tx *tx, struct kib_conn *conn);

static void kiblnd_unmap_tx(lnet_ni_t *ni, struct kib_tx *tx);

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

+8 −9
Original line number Diff line number Diff line
@@ -200,8 +200,7 @@ ldlm_interval_extent(struct ldlm_interval *node) 


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



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

			      l_sl_policy);

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

	return &lock->l_policy_data.l_extent;

}

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

+11 −10
Original line number Diff line number Diff line
@@ -1095,7 +1095,8 @@ int ldlm_init(void) 


	ldlm_lock_slab = kmem_cache_create("ldlm_locks",

					   sizeof(struct ldlm_lock), 0,

			      SLAB_HWCACHE_ALIGN | SLAB_DESTROY_BY_RCU, NULL);

					   SLAB_HWCACHE_ALIGN |

					   SLAB_DESTROY_BY_RCU, NULL);

	if (!ldlm_lock_slab) {

		kmem_cache_destroy(ldlm_resource_slab);

		return -ENOMEM;

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

+4 −6
Original line number Diff line number Diff line
@@ -1178,8 +1178,7 @@ static enum ldlm_policy_res ldlm_cancel_lrur_policy(struct ldlm_namespace *ns, 


	slv = ldlm_pool_get_slv(pl);

	lvf = ldlm_pool_get_lvf(pl);

	la = cfs_duration_sec(cfs_time_sub(cur,

			      lock->l_last_used));

	la = cfs_duration_sec(cfs_time_sub(cur, lock->l_last_used));

	lv = lvf * la * unused;



	/* Inform pool about current CLV to see it via debugfs. */
@@ -1608,8 +1607,7 @@ int ldlm_cli_cancel_list(struct list_head *cancels, int count, 
	 */

	while (count > 0) {

		LASSERT(!list_empty(cancels));

		lock = list_entry(cancels->next, struct ldlm_lock,

				      l_bl_ast);

		lock = list_entry(cancels->next, struct ldlm_lock, l_bl_ast);

		LASSERT(lock->l_conn_export);



		if (exp_connect_cancelset(lock->l_conn_export)) {