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

staging/lustre/osc: 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 30c0aa39

drivers/staging/lustre/lustre/osc/osc_cache.c

+7 −11
Original line number Diff line number Diff line
@@ -855,8 +855,7 @@ int osc_extent_finish(const struct lu_env *env, struct osc_extent *ext, 


	ext->oe_rc = rc ?: ext->oe_nr_pages;

	EASSERT(ergo(rc == 0, ext->oe_state == OES_RPC), ext);

	list_for_each_entry_safe(oap, tmp, &ext->oe_pages,

				     oap_pending_item) {

	list_for_each_entry_safe(oap, tmp, &ext->oe_pages, oap_pending_item) {

		list_del_init(&oap->oap_rpc_item);

		list_del_init(&oap->oap_pending_item);

		if (last_off <= oap->oap_obj_off) {
@@ -989,8 +988,7 @@ static int osc_extent_truncate(struct osc_extent *ext, pgoff_t trunc_index, 
		goto out;



	/* discard all pages with index greater then trunc_index */

	list_for_each_entry_safe(oap, tmp, &ext->oe_pages,

				     oap_pending_item) {

	list_for_each_entry_safe(oap, tmp, &ext->oe_pages, oap_pending_item) {

		struct cl_page *sub = oap2cl_page(oap);

		struct cl_page *page = cl_page_top(sub);
@@ -2051,8 +2049,7 @@ osc_send_read_rpc(const struct lu_env *env, struct client_obd *cli, 
	int rc = 0;



	LASSERT(osc_object_is_locked(osc));

	list_for_each_entry_safe(ext, next,

				     &osc->oo_reading_exts, oe_link) {

	list_for_each_entry_safe(ext, next, &osc->oo_reading_exts, oe_link) {

		EASSERT(ext->oe_state == OES_LOCK_DONE, ext);

		if (!try_to_add_extent_for_io(cli, ext, &rpclist, &page_count,

					      &max_pages))
@@ -2928,8 +2925,7 @@ int osc_cache_writeback_range(const struct lu_env *env, struct osc_object *obj, 
					ext->oe_max_end <= end, ext);

				osc_extent_state_set(ext, OES_LOCKING);

				ext->oe_owner = current;

				list_move_tail(&ext->oe_link,

						   &discard_list);

				list_move_tail(&ext->oe_link, &discard_list);

				osc_update_pending(obj, OBD_BRW_WRITE,

						   -ext->oe_nr_pages);

			}

drivers/staging/lustre/lustre/osc/osc_io.c

+2 −3
Original line number Diff line number Diff line
@@ -761,8 +761,7 @@ static void osc_req_attr_set(const struct lu_env *env, 
			struct cl_lock *scan;



			head = cl_object_header(apage->cp_obj);

			list_for_each_entry(scan, &head->coh_locks,

						cll_linkage)

			list_for_each_entry(scan, &head->coh_locks, cll_linkage)

				CL_LOCK_DEBUG(D_ERROR, env, scan,

					      "no cover page!\n");

			CL_PAGE_DEBUG(D_ERROR, env, apage,

drivers/staging/lustre/lustre/osc/osc_lock.c

+14 −13
Original line number Diff line number Diff line
@@ -1266,7 +1266,8 @@ static int osc_lock_flush(struct osc_lock *ols, int discard) 


		if (descr->cld_mode >= CLM_WRITE) {

			result = osc_cache_writeback_range(env, obj,

					descr->cld_start, descr->cld_end,

							   descr->cld_start,

							   descr->cld_end,

							   1, discard);

			LDLM_DEBUG(ols->ols_lock,

				   "lock %p: %d pages were %s.\n", lock, result,

drivers/staging/lustre/lustre/osc/osc_page.c

+18 −19
Original line number Diff line number Diff line
@@ -418,8 +418,7 @@ int osc_page_init(const struct lu_env *env, struct cl_object *obj, 
		struct osc_io *oio = osc_env_io(env);



		opg->ops_srvlock = osc_io_srvlock(oio);

		cl_page_slice_add(page, &opg->ops_cl, obj,

				&osc_page_ops);

		cl_page_slice_add(page, &opg->ops_cl, obj, &osc_page_ops);

	}

	/*

	 * Cannot assert osc_page_protected() here as read-ahead

drivers/staging/lustre/lustre/osc/osc_request.c

+8 −9
Original line number Diff line number Diff line
@@ -993,8 +993,7 @@ static int osc_grant_shrink_grant_cb(struct timeout_item *item, void *data) 
{

	struct client_obd *client;



	list_for_each_entry(client, &item->ti_obd_list,

				cl_grant_shrink_list) {

	list_for_each_entry(client, &item->ti_obd_list, cl_grant_shrink_list) {

		if (osc_should_shrink_grant(client))

			osc_shrink_grant(client);

	}

drivers/staging/lustre/lustre/osc/lproc_osc.c

+10 −10

File changed.

Contains only whitespace changes.