Commit 3dea3478 authored by Andreas Dilger's avatar Andreas Dilger Committed by Greg Kroah-Hartman
Browse files

staging: lustre: ldlm: remove ldlm_policy_data_t typedef usage from code 



Replace usage of ldlm_policy_data_t with named enums
to conform to upstream coding style.

Signed-off-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6142
Reviewed-on: http://review.whamcloud.com/15300
Reviewed-on: http://review.whamcloud.com/15301


Reviewed-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Reviewed-by: default avatarBob Glossman <bob.glossman@intel.com>
Reviewed-by: default avatarfrank zago <fzago@cray.com>
Reviewed-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5bba129e

drivers/staging/lustre/lustre/include/lustre_dlm.h

+8 −8
Original line number Diff line number Diff line
@@ -553,15 +553,15 @@ struct ldlm_flock { 
	__u32 pid;

};



typedef union {

union ldlm_policy_data {

	struct ldlm_extent l_extent;

	struct ldlm_flock l_flock;

	struct ldlm_inodebits l_inodebits;

} ldlm_policy_data_t;

};



void ldlm_convert_policy_to_local(struct obd_export *exp, enum ldlm_type type,

				  const ldlm_wire_policy_data_t *wpolicy,

				  ldlm_policy_data_t *lpolicy);

				  union ldlm_policy_data *lpolicy);



enum lvb_type {

	LVB_T_NONE	= 0,
@@ -690,7 +690,7 @@ struct ldlm_lock { 
	 * Representation of private data specific for a lock type.

	 * Examples are: extent range for extent lock or bitmask for ibits locks

	 */

	ldlm_policy_data_t	l_policy_data;

	union ldlm_policy_data	l_policy_data;



	/**

	 * Lock state flags. Protected by lr_lock.
@@ -1175,7 +1175,7 @@ void ldlm_lock_allow_match(struct ldlm_lock *lock); 
void ldlm_lock_allow_match_locked(struct ldlm_lock *lock);

enum ldlm_mode ldlm_lock_match(struct ldlm_namespace *ns, __u64 flags,

			       const struct ldlm_res_id *,

			       enum ldlm_type type, ldlm_policy_data_t *,

			       enum ldlm_type type, union ldlm_policy_data *,

			       enum ldlm_mode mode, struct lustre_handle *,

			       int unref);

enum ldlm_mode ldlm_revalidate_lock_handle(const struct lustre_handle *lockh,
@@ -1239,7 +1239,7 @@ int ldlm_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data); 
int ldlm_cli_enqueue(struct obd_export *exp, struct ptlrpc_request **reqp,

		     struct ldlm_enqueue_info *einfo,

		     const struct ldlm_res_id *res_id,

		     ldlm_policy_data_t const *policy, __u64 *flags,

		     union ldlm_policy_data const *policy, __u64 *flags,

		     void *lvb, __u32 lvb_len, enum lvb_type lvb_type,

		     struct lustre_handle *lockh, int async);

int ldlm_prep_enqueue_req(struct obd_export *exp,
@@ -1263,13 +1263,13 @@ int ldlm_cli_cancel_unused(struct ldlm_namespace *, const struct ldlm_res_id *, 
			   enum ldlm_cancel_flags flags, void *opaque);

int ldlm_cli_cancel_unused_resource(struct ldlm_namespace *ns,

				    const struct ldlm_res_id *res_id,

				    ldlm_policy_data_t *policy,

				    union ldlm_policy_data *policy,

				    enum ldlm_mode mode,

				    enum ldlm_cancel_flags flags,

				    void *opaque);

int ldlm_cancel_resource_local(struct ldlm_resource *res,

			       struct list_head *cancels,

			       ldlm_policy_data_t *policy,

			       union ldlm_policy_data *policy,

			       enum ldlm_mode mode, __u64 lock_flags,

			       enum ldlm_cancel_flags cancel_flags,

			       void *opaque);

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

+3 −3
Original line number Diff line number Diff line
@@ -879,7 +879,7 @@ struct md_ops { 
		      const void *, size_t, umode_t, uid_t, gid_t,

		      cfs_cap_t, __u64, struct ptlrpc_request **);

	int (*enqueue)(struct obd_export *, struct ldlm_enqueue_info *,

		       const ldlm_policy_data_t *,

		       const union ldlm_policy_data *,

		       struct lookup_intent *, struct md_op_data *,

		       struct lustre_handle *, __u64);

	int (*getattr)(struct obd_export *, struct md_op_data *,
@@ -935,11 +935,11 @@ struct md_ops { 


	enum ldlm_mode (*lock_match)(struct obd_export *, __u64,

				     const struct lu_fid *, enum ldlm_type,

				     ldlm_policy_data_t *, enum ldlm_mode,

				     union ldlm_policy_data *, enum ldlm_mode,

				     struct lustre_handle *);



	int (*cancel_unused)(struct obd_export *, const struct lu_fid *,

			     ldlm_policy_data_t *, enum ldlm_mode,

			     union ldlm_policy_data *, enum ldlm_mode,

			     enum ldlm_cancel_flags flags, void *opaque);



	int (*get_fid_from_lsm)(struct obd_export *,

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

+3 −3
Original line number Diff line number Diff line
@@ -1208,7 +1208,7 @@ static inline int md_create(struct obd_export *exp, struct md_op_data *op_data, 


static inline int md_enqueue(struct obd_export *exp,

			     struct ldlm_enqueue_info *einfo,

			     const ldlm_policy_data_t *policy,

			     const union ldlm_policy_data *policy,

			     struct lookup_intent *it,

			     struct md_op_data *op_data,

			     struct lustre_handle *lockh,
@@ -1407,7 +1407,7 @@ static inline int md_set_lock_data(struct obd_export *exp, 


static inline int md_cancel_unused(struct obd_export *exp,

				   const struct lu_fid *fid,

				   ldlm_policy_data_t *policy,

				   union ldlm_policy_data *policy,

				   enum ldlm_mode mode,

				   enum ldlm_cancel_flags flags,

				   void *opaque)
@@ -1425,7 +1425,7 @@ static inline int md_cancel_unused(struct obd_export *exp, 
static inline enum ldlm_mode md_lock_match(struct obd_export *exp, __u64 flags,

					   const struct lu_fid *fid,

					   enum ldlm_type type,

					   ldlm_policy_data_t *policy,

					   union ldlm_policy_data *policy,

					   enum ldlm_mode mode,

					   struct lustre_handle *lockh)

{

drivers/staging/lustre/lustre/ldlm/ldlm_extent.c

+2 −2
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ void ldlm_extent_unlink_lock(struct ldlm_lock *lock) 
}



void ldlm_extent_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,

				      ldlm_policy_data_t *lpolicy)

				      union ldlm_policy_data *lpolicy)

{

	memset(lpolicy, 0, sizeof(*lpolicy));

	lpolicy->l_extent.start = wpolicy->l_extent.start;
@@ -249,7 +249,7 @@ void ldlm_extent_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy, 
	lpolicy->l_extent.gid = wpolicy->l_extent.gid;

}



void ldlm_extent_policy_local_to_wire(const ldlm_policy_data_t *lpolicy,

void ldlm_extent_policy_local_to_wire(const union ldlm_policy_data *lpolicy,

				      ldlm_wire_policy_data_t *wpolicy)

{

	memset(wpolicy, 0, sizeof(*wpolicy));

drivers/staging/lustre/lustre/ldlm/ldlm_flock.c

+2 −2
Original line number Diff line number Diff line
@@ -613,7 +613,7 @@ granted: 
EXPORT_SYMBOL(ldlm_flock_completion_ast);



void ldlm_flock_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,

				     ldlm_policy_data_t *lpolicy)

				     union ldlm_policy_data *lpolicy)

{

	memset(lpolicy, 0, sizeof(*lpolicy));

	lpolicy->l_flock.start = wpolicy->l_flock.lfw_start;
@@ -622,7 +622,7 @@ void ldlm_flock_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy, 
	lpolicy->l_flock.owner = wpolicy->l_flock.lfw_owner;

}



void ldlm_flock_policy_local_to_wire(const ldlm_policy_data_t *lpolicy,

void ldlm_flock_policy_local_to_wire(const union ldlm_policy_data *lpolicy,

				     ldlm_wire_policy_data_t *wpolicy)

{

	memset(wpolicy, 0, sizeof(*wpolicy));

CRA Git | Maintained and supported by SUSTech CRA and CCSE