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

staging/lustre/include: Fix style of function declarations 



This mostly fixes checkpatch complaints about
"Alignment should match open parenthesis" and
"space prohibited between function name and open parenthesis"

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

drivers/staging/lustre/lustre/include/cl_object.h

+200 −210
Original line number Diff line number Diff line
@@ -2796,15 +2796,11 @@ enum { 
/* callback of cl_page_gang_lookup() */

typedef int   (*cl_page_gang_cb_t)  (const struct lu_env *, struct cl_io *,

				     struct cl_page *, void *);

int	     cl_page_gang_lookup (const struct lu_env *env,

				     struct cl_object *obj,

				     struct cl_io *io,

				     pgoff_t start, pgoff_t end,

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

			struct cl_io *io, pgoff_t start, pgoff_t end,

			cl_page_gang_cb_t cb, void *cbdata);

struct cl_page *cl_page_lookup      (struct cl_object_header *hdr,

				     pgoff_t index);

struct cl_page *cl_page_find	(const struct lu_env *env,

				     struct cl_object *obj,

struct cl_page *cl_page_lookup(struct cl_object_header *hdr, pgoff_t index);

struct cl_page *cl_page_find(const struct lu_env *env, struct cl_object *obj,

			     pgoff_t idx, struct page *vmpage,

			     enum cl_page_type type);

struct cl_page *cl_page_find_sub(const struct lu_env *env,
@@ -2812,16 +2808,12 @@ struct cl_page *cl_page_find_sub (const struct lu_env *env, 
				 pgoff_t idx, struct page *vmpage,

				     struct cl_page *parent);

void cl_page_get(struct cl_page *page);

void	    cl_page_put	 (const struct lu_env *env,

				     struct cl_page *page);

void	    cl_page_print       (const struct lu_env *env, void *cookie,

				     lu_printer_t printer,

void cl_page_put(const struct lu_env *env, struct cl_page *page);

void cl_page_print(const struct lu_env *env, void *cookie, lu_printer_t printer,

		   const struct cl_page *pg);

void cl_page_header_print(const struct lu_env *env, void *cookie,

				     lu_printer_t printer,

				     const struct cl_page *pg);

struct page     *cl_page_vmpage      (const struct lu_env *env,

				     struct cl_page *page);

			  lu_printer_t printer, const struct cl_page *pg);

struct page *cl_page_vmpage(const struct lu_env *env, struct cl_page *page);

struct cl_page *cl_vmpage_page(struct page *vmpage, struct cl_object *obj);

struct cl_page *cl_page_top(struct cl_page *page);
@@ -2882,10 +2874,8 @@ void cl_page_discard (const struct lu_env *env, struct cl_io *io, 
void cl_page_delete(const struct lu_env *env, struct cl_page *pg);

int cl_page_unmap(const struct lu_env *env, struct cl_io *io,

		  struct cl_page *pg);

int     cl_page_is_vmlocked  (const struct lu_env *env,

			      const struct cl_page *pg);

void    cl_page_export       (const struct lu_env *env,

			      struct cl_page *pg, int uptodate);

int cl_page_is_vmlocked(const struct lu_env *env, const struct cl_page *pg);

void cl_page_export(const struct lu_env *env, struct cl_page *pg, int uptodate);

int cl_page_is_under_lock(const struct lu_env *env, struct cl_io *io,

			  struct cl_page *page);

loff_t cl_offset(const struct cl_object *obj, pgoff_t idx);
@@ -3140,8 +3130,7 @@ void cl_page_list_init (struct cl_page_list *plist); 
void cl_page_list_add(struct cl_page_list *plist, struct cl_page *page);

void cl_page_list_move(struct cl_page_list *dst, struct cl_page_list *src,

		       struct cl_page *page);

void cl_page_list_splice (struct cl_page_list *list,

			  struct cl_page_list *head);

void cl_page_list_splice(struct cl_page_list *list, struct cl_page_list *head);

void cl_page_list_disown(const struct lu_env *env,

			 struct cl_io *io, struct cl_page_list *plist);
@@ -3170,7 +3159,8 @@ void cl_req_attr_set (const struct lu_env *env, struct cl_req *req, 
void cl_req_completion(const struct lu_env *env, struct cl_req *req, int ioret);



/** \defgroup cl_sync_io cl_sync_io

 * @{ */

 * @{

 */



/**

 * Anchor for synchronous transfer. This is allocated on a stack by thread

drivers/staging/lustre/lustre/include/lprocfs_status.h

+2 −4
Original line number Diff line number Diff line
@@ -427,8 +427,7 @@ static inline void lprocfs_stats_unlock(struct lprocfs_stats *stats, int opc, 
	case LPROCFS_GET_SMP_ID:

		if (stats->ls_flags & LPROCFS_STATS_FLAG_NOPERCPU) {

			if (stats->ls_flags & LPROCFS_STATS_FLAG_IRQ_SAFE) {

				spin_unlock_irqrestore(&stats->ls_lock,

							   *flags);

				spin_unlock_irqrestore(&stats->ls_lock, *flags);

			} else {

				spin_unlock(&stats->ls_lock);

			}
@@ -440,8 +439,7 @@ static inline void lprocfs_stats_unlock(struct lprocfs_stats *stats, int opc, 
	case LPROCFS_GET_NUM_CPU:

		if (stats->ls_flags & LPROCFS_STATS_FLAG_NOPERCPU) {

			if (stats->ls_flags & LPROCFS_STATS_FLAG_IRQ_SAFE) {

				spin_unlock_irqrestore(&stats->ls_lock,

							   *flags);

				spin_unlock_irqrestore(&stats->ls_lock, *flags);

			} else {

				spin_unlock(&stats->ls_lock);

			}

drivers/staging/lustre/lustre/include/lustre/lustre_idl.h

+4 −6
Original line number Diff line number Diff line
@@ -638,15 +638,13 @@ static inline void ostid_set_id(struct ost_id *oi, __u64 oid) 
{

	if (fid_seq_is_mdt0(ostid_seq(oi))) {

		if (oid >= IDIF_MAX_OID) {

			CERROR("Bad %llu to set "DOSTID"\n",

				oid, POSTID(oi));

			CERROR("Bad %llu to set " DOSTID "\n", oid, POSTID(oi));

			return;

		}

		oi->oi.oi_id = oid;

	} else {

		if (oid > OBIF_MAX_OID) {

			CERROR("Bad %llu to set "DOSTID"\n",

				oid, POSTID(oi));

			CERROR("Bad %llu to set " DOSTID "\n", oid, POSTID(oi));

			return;

		}

		oi->oi_fid.f_oid = oid;

drivers/staging/lustre/lustre/include/lustre_net.h

+9 −10
Original line number Diff line number Diff line
@@ -2383,13 +2383,13 @@ struct ptlrpc_request *ptlrpc_request_alloc(struct obd_import *imp, 
					    const struct req_format *format);

struct ptlrpc_request *ptlrpc_request_alloc_pool(struct obd_import *imp,

						 struct ptlrpc_request_pool *,

					    const struct req_format *format);

						 const struct req_format *);

void ptlrpc_request_free(struct ptlrpc_request *request);

int ptlrpc_request_pack(struct ptlrpc_request *request,

			__u32 version, int opcode);

struct ptlrpc_request *ptlrpc_request_alloc_pack(struct obd_import *imp,

						const struct req_format *format,

						__u32 version, int opcode);

struct ptlrpc_request *ptlrpc_request_alloc_pack(struct obd_import *,

						 const struct req_format *,

						 __u32, int);

int ptlrpc_request_bufs_pack(struct ptlrpc_request *request,

			     __u32 version, int opcode, char **bufs,

			     struct ptlrpc_cli_ctx *ctx);
@@ -2509,8 +2509,7 @@ struct ptlrpc_service_conf { 
 */

void ptlrpc_dispatch_difficult_reply(struct ptlrpc_reply_state *rs);

void ptlrpc_schedule_difficult_reply(struct ptlrpc_reply_state *rs);

struct ptlrpc_service *ptlrpc_register_service(

				struct ptlrpc_service_conf *conf,

struct ptlrpc_service *ptlrpc_register_service(struct ptlrpc_service_conf *conf,

					       struct kset *parent,

					       struct dentry *debugfs_entry);

drivers/staging/lustre/lustre/include/lustre_sec.h

+53 −75
Original line number Diff line number Diff line
@@ -351,8 +351,7 @@ struct ptlrpc_ctx_ops { 
	/**

	 * To determine whether it's suitable to use the \a ctx for \a vcred.

	 */

	int     (*match)       (struct ptlrpc_cli_ctx *ctx,

				struct vfs_cred *vcred);

	int (*match)(struct ptlrpc_cli_ctx *ctx, struct vfs_cred *vcred);



	/**

	 * To bring the \a ctx uptodate.
@@ -367,10 +366,8 @@ struct ptlrpc_ctx_ops { 
	/**

	 * Force the \a ctx to die.

	 */

	void    (*force_die)   (struct ptlrpc_cli_ctx *ctx,

				int grace);

	int     (*display)     (struct ptlrpc_cli_ctx *ctx,

				char *buf, int bufsize);

	void (*force_die)(struct ptlrpc_cli_ctx *ctx, int grace);

	int (*display)(struct ptlrpc_cli_ctx *ctx, char *buf, int bufsize);



	/**

	 * Sign the request message using \a ctx.
@@ -382,8 +379,7 @@ struct ptlrpc_ctx_ops { 
	 *

	 * \see null_ctx_sign(), plain_ctx_sign(), gss_cli_ctx_sign().

	 */

	int     (*sign)	(struct ptlrpc_cli_ctx *ctx,

				struct ptlrpc_request *req);

	int (*sign)(struct ptlrpc_cli_ctx *ctx, struct ptlrpc_request *req);



	/**

	 * Verify the reply message using \a ctx.
@@ -395,8 +391,7 @@ struct ptlrpc_ctx_ops { 
	 *

	 * \see null_ctx_verify(), plain_ctx_verify(), gss_cli_ctx_verify().

	 */

	int     (*verify)      (struct ptlrpc_cli_ctx *ctx,

				struct ptlrpc_request *req);

	int (*verify)(struct ptlrpc_cli_ctx *ctx, struct ptlrpc_request *req);



	/**

	 * Encrypt the request message using \a ctx.
@@ -408,8 +403,7 @@ struct ptlrpc_ctx_ops { 
	 *

	 * \see gss_cli_ctx_seal().

	 */

	int     (*seal)	(struct ptlrpc_cli_ctx *ctx,

				struct ptlrpc_request *req);

	int (*seal)(struct ptlrpc_cli_ctx *ctx, struct ptlrpc_request *req);



	/**

	 * Decrypt the reply message using \a ctx.
@@ -421,8 +415,7 @@ struct ptlrpc_ctx_ops { 
	 *

	 * \see gss_cli_ctx_unseal().

	 */

	int     (*unseal)      (struct ptlrpc_cli_ctx *ctx,

				struct ptlrpc_request *req);

	int (*unseal)(struct ptlrpc_cli_ctx *ctx, struct ptlrpc_request *req);



	/**

	 * Wrap bulk request data. This is called before wrapping RPC
@@ -546,8 +539,7 @@ struct ptlrpc_sec_cops { 
	 */

	struct ptlrpc_cli_ctx *(*lookup_ctx)(struct ptlrpc_sec *sec,

					     struct vfs_cred *vcred,

						int create,

						int remove_dead);

					     int create, int remove_dead);



	/**

	 * Called then the reference of \a ctx dropped to 0. The policy module
@@ -559,8 +551,7 @@ struct ptlrpc_sec_cops { 
	 *

	 * \see plain_release_ctx(), gss_sec_release_ctx_kr().

	 */

	void		    (*release_ctx) (struct ptlrpc_sec *sec,

						struct ptlrpc_cli_ctx *ctx,

	void (*release_ctx)(struct ptlrpc_sec *sec, struct ptlrpc_cli_ctx *ctx,

			    int sync);



	/**
@@ -573,11 +564,8 @@ struct ptlrpc_sec_cops { 
	 *

	 * \see plain_flush_ctx_cache(), gss_sec_flush_ctx_cache_kr().

	 */

	int		     (*flush_ctx_cache)

					       (struct ptlrpc_sec *sec,

						uid_t uid,

						int grace,

						int force);

	int (*flush_ctx_cache)(struct ptlrpc_sec *sec, uid_t uid,

			       int grace, int force);



	/**

	 * Called periodically by garbage collector to remove dead contexts
@@ -593,8 +581,7 @@ struct ptlrpc_sec_cops { 
	 * XXX currently it's only used by GSS module, maybe we should remove

	 * this from general API.

	 */

	int		     (*install_rctx)(struct obd_import *imp,

						struct ptlrpc_sec *sec,

	int (*install_rctx)(struct obd_import *imp, struct ptlrpc_sec *sec,

			    struct ptlrpc_cli_ctx *ctx);



	/**
@@ -608,8 +595,7 @@ struct ptlrpc_sec_cops { 
	 *

	 * \see null_alloc_reqbuf(), plain_alloc_reqbuf(), gss_alloc_reqbuf().

	 */

	int		     (*alloc_reqbuf)(struct ptlrpc_sec *sec,

						struct ptlrpc_request *req,

	int (*alloc_reqbuf)(struct ptlrpc_sec *sec, struct ptlrpc_request *req,

			    int lustre_msg_size);



	/**
@@ -619,8 +605,7 @@ struct ptlrpc_sec_cops { 
	 *

	 * \see null_free_reqbuf(), plain_free_reqbuf(), gss_free_reqbuf().

	 */

	void		    (*free_reqbuf) (struct ptlrpc_sec *sec,

						struct ptlrpc_request *req);

	void (*free_reqbuf)(struct ptlrpc_sec *sec, struct ptlrpc_request *req);



	/**

	 * To allocate reply buffer for \a req.
@@ -632,8 +617,7 @@ struct ptlrpc_sec_cops { 
	 *

	 * \see null_alloc_repbuf(), plain_alloc_repbuf(), gss_alloc_repbuf().

	 */

	int		     (*alloc_repbuf)(struct ptlrpc_sec *sec,

						struct ptlrpc_request *req,

	int (*alloc_repbuf)(struct ptlrpc_sec *sec, struct ptlrpc_request *req,

			    int lustre_msg_size);



	/**
@@ -645,8 +629,7 @@ struct ptlrpc_sec_cops { 
	 *

	 * \see null_free_repbuf(), plain_free_repbuf(), gss_free_repbuf().

	 */

	void		    (*free_repbuf) (struct ptlrpc_sec *sec,

						struct ptlrpc_request *req);

	void (*free_repbuf)(struct ptlrpc_sec *sec, struct ptlrpc_request *req);



	/**

	 * To expand the request buffer of \a req, thus the \a segment in
@@ -658,15 +641,13 @@ struct ptlrpc_sec_cops { 
	 * \see null_enlarge_reqbuf(), plain_enlarge_reqbuf(),

	 * gss_enlarge_reqbuf().

	 */

	int		     (*enlarge_reqbuf)

					       (struct ptlrpc_sec *sec,

	int (*enlarge_reqbuf)(struct ptlrpc_sec *sec,

			      struct ptlrpc_request *req,

			      int segment, int newsize);

	/*

	 * misc

	 */

	int		     (*display)     (struct ptlrpc_sec *sec,

						struct seq_file *seq);

	int (*display)(struct ptlrpc_sec *sec, struct seq_file *seq);

};



/**
@@ -709,8 +690,7 @@ struct ptlrpc_sec_sops { 
	 *

	 * \see gss_svc_invalidate_ctx().

	 */

	void		    (*invalidate_ctx)

					       (struct ptlrpc_svc_ctx *ctx);

	void (*invalidate_ctx)(struct ptlrpc_svc_ctx *ctx);



	/**

	 * Allocate a ptlrpc_reply_state.
@@ -724,8 +704,7 @@ struct ptlrpc_sec_sops { 
	 *

	 * \see null_alloc_rs(), plain_alloc_rs(), gss_svc_alloc_rs().

	 */

	int		     (*alloc_rs)    (struct ptlrpc_request *req,

						int msgsize);

	int (*alloc_rs)(struct ptlrpc_request *req, int msgsize);



	/**

	 * Free a ptlrpc_reply_state.
@@ -744,8 +723,7 @@ struct ptlrpc_sec_sops { 
	 *

	 * \see gss_svc_install_rctx_kr().

	 */

	int		     (*install_rctx)(struct obd_import *imp,

						struct ptlrpc_svc_ctx *ctx);

	int (*install_rctx)(struct obd_import *imp, struct ptlrpc_svc_ctx *ctx);



	/**

	 * Prepare buffer for incoming bulk write.

drivers/staging/lustre/lustre/include/lustre_req_layout.h

+2 −2

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/include/obd.h

+3 −3

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/include/obd_class.h

+7 −7

File changed.

Contains only whitespace changes.

drivers/staging/lustre/lustre/include/lustre_fid.h

+1 −1

File changed.

Contains only whitespace changes.