Commit b6c82cc8 authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files

staging: lustre: lustre: fix all braces issues reported by checkpatch 



Cleanup all braces that was reported by checkpatch. The only
issue not fixed up is in mdc_lock.c. Removing the braces in
the case of mdc_lock.c will break the build.

Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 09dad312

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

+2 −1
Original line number Diff line number Diff line
@@ -348,10 +348,11 @@ static void fld_cache_overlap_handle(struct fld_cache *cache, 


		f_curr->fce_range.lsr_end = new_start;

		fld_cache_entry_add(cache, f_new, &f_curr->fce_list);

	} else

	} else {

		CERROR("NEW range =" DRANGE " curr = " DRANGE "\n",

		       PRANGE(range), PRANGE(&f_curr->fce_range));

	}

}



struct fld_cache_entry

*fld_cache_entry_create(const struct lu_seq_range *range)

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

+5 −4
Original line number Diff line number Diff line
@@ -1029,11 +1029,11 @@ void ldlm_grant_lock(struct ldlm_lock *lock, struct list_head *work_list) 
	if (work_list && lock->l_completion_ast)

		ldlm_add_ast_work_item(lock, NULL, work_list);



	if (res->lr_type == LDLM_PLAIN || res->lr_type == LDLM_IBITS)

	if (res->lr_type == LDLM_PLAIN || res->lr_type == LDLM_IBITS) {

		ldlm_grant_lock_with_skiplist(lock);

	else if (res->lr_type == LDLM_EXTENT)

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

		ldlm_extent_add_lock(res, lock);

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

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

		/*

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

		 * - this is an UNLOCK but not a real lock;
@@ -1045,8 +1045,9 @@ void ldlm_grant_lock(struct ldlm_lock *lock, struct list_head *work_list) 
		    ldlm_is_test_lock(lock) || ldlm_is_flock_deadlock(lock))

			return;

		ldlm_resource_add_lock(res, &res->lr_granted, lock);

	} else

	} else {

		LBUG();

	}



	ldlm_pool_add(&ldlm_res_to_ns(res)->ns_pool, lock);

}

drivers/staging/lustre/lustre/llite/vvp_dev.c

+3 −2
Original line number Diff line number Diff line
@@ -591,9 +591,10 @@ static void *vvp_pgcache_start(struct seq_file *f, loff_t *pos) 
	env = cl_env_get(&refcheck);

	if (!IS_ERR(env)) {

		sbi = f->private;

		if (sbi->ll_site->ls_obj_hash->hs_cur_bits > 64 - PGC_OBJ_SHIFT)

		if (sbi->ll_site->ls_obj_hash->hs_cur_bits >

		    64 - PGC_OBJ_SHIFT) {

			pos = ERR_PTR(-EFBIG);

		else {

		} else {

			*pos = vvp_pgcache_find(env, &sbi->ll_cl->cd_lu_dev,

						*pos);

			if (*pos == ~0ULL)