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

staging/lustre/obdclass: Fix style vs open parenthesis alignment 



This mostly fixes checkpatch complaints about
"Alignment should match open parenthesis"

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

drivers/staging/lustre/lustre/obdclass/cl_io.c

+9 −11
Original line number Diff line number Diff line
@@ -385,8 +385,7 @@ static int cl_lockset_lock_one(const struct lu_env *env, 
		if (!(link->cill_descr.cld_enq_flags & CEF_ASYNC)) {

			result = cl_wait(env, lock);

			if (result == 0)

				list_move(&link->cill_linkage,

					      &set->cls_done);

				list_move(&link->cill_linkage, &set->cls_done);

		} else

			result = 0;

	} else
@@ -434,8 +433,7 @@ static int cl_lockset_lock(const struct lu_env *env, struct cl_io *io, 
			lock = link->cill_lock;

			result = cl_wait(env, lock);

			if (result == 0)

				list_move(&link->cill_linkage,

					      &set->cls_done);

				list_move(&link->cill_linkage, &set->cls_done);

			else

				break;

		}

drivers/staging/lustre/lustre/obdclass/cl_lock.c

+10 −11
Original line number Diff line number Diff line
@@ -382,8 +382,7 @@ static struct cl_lock *cl_lock_alloc(const struct lu_env *env, 
		CS_LOCK_INC(obj, total);

		CS_LOCK_INC(obj, create);

		cl_lock_lockdep_init(lock);

		list_for_each_entry(obj, &head->loh_layers,

					co_lu.lo_linkage) {

		list_for_each_entry(obj, &head->loh_layers, co_lu.lo_linkage) {

			int err;



			err = obj->co_ops->coo_lock_init(env, obj, lock, io);

drivers/staging/lustre/lustre/obdclass/cl_object.c

+4 −6
Original line number Diff line number Diff line
@@ -247,8 +247,7 @@ int cl_object_attr_set(const struct lu_env *env, struct cl_object *obj, 


	top = obj->co_lu.lo_header;

	result = 0;

	list_for_each_entry_reverse(obj, &top->loh_layers,

					co_lu.lo_linkage) {

	list_for_each_entry_reverse(obj, &top->loh_layers, co_lu.lo_linkage) {

		if (obj->co_ops->coo_attr_set) {

			result = obj->co_ops->coo_attr_set(env, obj, attr, v);

			if (result != 0) {
@@ -278,8 +277,7 @@ int cl_object_glimpse(const struct lu_env *env, struct cl_object *obj, 


	top = obj->co_lu.lo_header;

	result = 0;

	list_for_each_entry_reverse(obj, &top->loh_layers,

					co_lu.lo_linkage) {

	list_for_each_entry_reverse(obj, &top->loh_layers, co_lu.lo_linkage) {

		if (obj->co_ops->coo_glimpse) {

			result = obj->co_ops->coo_glimpse(env, obj, lvb);

			if (result != 0)

drivers/staging/lustre/lustre/obdclass/cl_page.c

+5 −5
Original line number Diff line number Diff line
@@ -277,7 +277,8 @@ static inline void cl_page_state_set_trust(struct cl_page *page, 
}



static struct cl_page *cl_page_alloc(const struct lu_env *env,

		struct cl_object *o, pgoff_t ind, struct page *vmpage,

				     struct cl_object *o, pgoff_t ind,

				     struct page *vmpage,

				     enum cl_page_type type)

{

	struct cl_page	  *page;
@@ -303,8 +304,7 @@ static struct cl_page *cl_page_alloc(const struct lu_env *env, 
		mutex_init(&page->cp_mutex);

		lu_ref_init(&page->cp_reference);

		head = o->co_lu.lo_header;

		list_for_each_entry(o, &head->loh_layers,

					co_lu.lo_linkage) {

		list_for_each_entry(o, &head->loh_layers, co_lu.lo_linkage) {

			if (o->co_ops->coo_page_init) {

				result = o->co_ops->coo_page_init(env, o,

								  page, vmpage);

drivers/staging/lustre/lustre/obdclass/class_obd.c

+1 −2
Original line number Diff line number Diff line
@@ -199,8 +199,7 @@ int class_handle_ioctl(unsigned int cmd, unsigned long arg) 
			err = -ENOMEM;

			goto out;

		}

		err = copy_from_user(lcfg, data->ioc_pbuf1,

					 data->ioc_plen1);

		err = copy_from_user(lcfg, data->ioc_pbuf1, data->ioc_plen1);

		if (!err)

			err = lustre_cfg_sanity_check(lcfg, data->ioc_plen1);

		if (!err)