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

staging/lustre/lov: 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 926d6fb2

drivers/staging/lustre/lustre/lov/lov_cl_internal.h

+42 −45
Original line number Diff line number Diff line
@@ -615,11 +615,9 @@ int lov_page_init(const struct lu_env *env, struct cl_object *ob, 
int lovsub_page_init(const struct lu_env *env, struct cl_object *ob,

		     struct cl_page *page, struct page *vmpage);



int   lov_page_init_empty(const struct lu_env *env,

			   struct cl_object *obj,

int lov_page_init_empty(const struct lu_env *env, struct cl_object *obj,

			struct cl_page *page, struct page *vmpage);

int   lov_page_init_raid0(const struct lu_env *env,

			   struct cl_object *obj,

int lov_page_init_raid0(const struct lu_env *env, struct cl_object *obj,

			struct cl_page *page, struct page *vmpage);

struct lu_object *lov_object_alloc(const struct lu_env *env,

				   const struct lu_object_header *hdr,
@@ -631,8 +629,7 @@ struct lu_object *lovsub_object_alloc(const struct lu_env *env, 
struct lov_lock_link *lov_lock_link_find(const struct lu_env *env,

					 struct lov_lock *lck,

					 struct lovsub_lock *sub);

struct lov_io_sub    *lov_page_subio(const struct lu_env *env,

					 struct lov_io *lio,

struct lov_io_sub *lov_page_subio(const struct lu_env *env, struct lov_io *lio,

				  const struct cl_page_slice *slice);



#define lov_foreach_target(lov, var)		    \

drivers/staging/lustre/lustre/lov/lov_internal.h

+2 −4
Original line number Diff line number Diff line
@@ -138,12 +138,10 @@ int lov_merge_lvb_kms(struct lov_stripe_md *lsm, 
		      struct ost_lvb *lvb, __u64 *kms_place);



/* lov_offset.c */

u64 lov_stripe_size(struct lov_stripe_md *lsm, u64 ost_size,

			 int stripeno);

u64 lov_stripe_size(struct lov_stripe_md *lsm, u64 ost_size, int stripeno);

int lov_stripe_offset(struct lov_stripe_md *lsm, u64 lov_off,

		      int stripeno, u64 *u64);

u64 lov_size_to_stripe(struct lov_stripe_md *lsm, u64 file_size,

			   int stripeno);

u64 lov_size_to_stripe(struct lov_stripe_md *lsm, u64 file_size, int stripeno);

int lov_stripe_intersects(struct lov_stripe_md *lsm, int stripeno,

			  u64 start, u64 end,

			  u64 *obd_start, u64 *obd_end);

drivers/staging/lustre/lustre/lov/lov_lock.c

+4 −3
Original line number Diff line number Diff line
@@ -1125,7 +1125,8 @@ static void lov_empty_lock_fini(const struct lu_env *env, 
}



static int lov_empty_lock_print(const struct lu_env *env, void *cookie,

			lu_printer_t p, const struct cl_lock_slice *slice)

				lu_printer_t p,

				const struct cl_lock_slice *slice)

{

	(*p)(env, cookie, "empty\n");

	return 0;

drivers/staging/lustre/lustre/lov/lov_obd.c

+18 −17
Original line number Diff line number Diff line
@@ -621,8 +621,8 @@ static int lov_add_target(struct obd_device *obd, struct obd_uuid *uuidp, 
	if (lov->lov_cache) {

		rc = obd_set_info_async(NULL, tgt->ltd_exp,

					sizeof(KEY_CACHE_SET), KEY_CACHE_SET,

				sizeof(struct cl_client_cache), lov->lov_cache,

				NULL);

					sizeof(struct cl_client_cache),

					lov->lov_cache, NULL);

		if (rc < 0)

			goto out;

	}
@@ -1762,7 +1762,8 @@ static int lov_fiemap(struct lov_obd *lov, __u32 keylen, void *key, 
		fm_end = fm_key->oa.o_size;



	last_stripe = fiemap_calc_last_stripe(lsm, fm_start, fm_end,

					    actual_start_stripe, &stripe_count);

					      actual_start_stripe,

					      &stripe_count);



	fm_end_offset = fiemap_calc_fm_end_offset(fiemap, lsm, fm_start,

						  fm_end, &start_stripe);

drivers/staging/lustre/lustre/lov/lov_offset.c

+1 −2
Original line number Diff line number Diff line
@@ -43,8 +43,7 @@ 
#include "lov_internal.h"



/* compute object size given "stripeno" and the ost size */

u64 lov_stripe_size(struct lov_stripe_md *lsm, u64 ost_size,

			 int stripeno)

u64 lov_stripe_size(struct lov_stripe_md *lsm, u64 ost_size, int stripeno)

{

	unsigned long ssize = lsm->lsm_stripe_size;

	unsigned long stripe_size;