Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 394a9726 authored by Andreas Dilger's avatar Andreas Dilger Committed by Greg Kroah-Hartman
Browse files

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



Replace usage of ldlm_wire_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 2885bdea

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

+3 −3
Original line number Diff line number Diff line
@@ -2623,11 +2623,11 @@ struct ldlm_flock_wire { 
 * on the resource type.

 */



typedef union {

union ldlm_wire_policy_data {

	struct ldlm_extent l_extent;

	struct ldlm_flock_wire l_flock;

	struct ldlm_inodebits l_inodebits;

} ldlm_wire_policy_data_t;

};



union ldlm_gl_desc {

	struct ldlm_gl_lquota_desc	lquota_desc;
@@ -2669,7 +2669,7 @@ struct ldlm_lock_desc { 
	struct ldlm_resource_desc l_resource;

	enum ldlm_mode l_req_mode;

	enum ldlm_mode l_granted_mode;

	ldlm_wire_policy_data_t l_policy_data;

	union ldlm_wire_policy_data l_policy_data;

};



#define LDLM_LOCKREQ_HANDLES 2

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

+1 −1
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ union ldlm_policy_data { 
};



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

				  const ldlm_wire_policy_data_t *wpolicy,

				  const union ldlm_wire_policy_data *wpolicy,

				  union ldlm_policy_data *lpolicy);



enum lvb_type {

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

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

}



void ldlm_extent_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,

void ldlm_extent_policy_wire_to_local(const union ldlm_wire_policy_data *wpolicy,

				      union ldlm_policy_data *lpolicy)

{

	memset(lpolicy, 0, sizeof(*lpolicy));
@@ -250,7 +250,7 @@ void ldlm_extent_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy, 
}



void ldlm_extent_policy_local_to_wire(const union ldlm_policy_data *lpolicy,

				      ldlm_wire_policy_data_t *wpolicy)

				      union ldlm_wire_policy_data *wpolicy)

{

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

	wpolicy->l_extent.start = lpolicy->l_extent.start;

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

+2 −2
Original line number Diff line number Diff line
@@ -612,7 +612,7 @@ ldlm_flock_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data) 
}

EXPORT_SYMBOL(ldlm_flock_completion_ast);



void ldlm_flock_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,

void ldlm_flock_policy_wire_to_local(const union ldlm_wire_policy_data *wpolicy,

				     union ldlm_policy_data *lpolicy)

{

	memset(lpolicy, 0, sizeof(*lpolicy));
@@ -623,7 +623,7 @@ void ldlm_flock_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy, 
}



void ldlm_flock_policy_local_to_wire(const union ldlm_policy_data *lpolicy,

				     ldlm_wire_policy_data_t *wpolicy)

				     union ldlm_wire_policy_data *wpolicy)

{

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

	wpolicy->l_flock.lfw_start = lpolicy->l_flock.start;

drivers/staging/lustre/lustre/ldlm/ldlm_inodebits.c

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
#include "../include/lustre_lib.h"

#include "ldlm_internal.h"



void ldlm_ibits_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,

void ldlm_ibits_policy_wire_to_local(const union ldlm_wire_policy_data *wpolicy,

				     union ldlm_policy_data *lpolicy)

{

	memset(lpolicy, 0, sizeof(*lpolicy));
@@ -62,7 +62,7 @@ void ldlm_ibits_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy, 
}



void ldlm_ibits_policy_local_to_wire(const union ldlm_policy_data *lpolicy,

				     ldlm_wire_policy_data_t *wpolicy)

				     union ldlm_wire_policy_data *wpolicy)

{

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

	wpolicy->l_inodebits.bits = lpolicy->l_inodebits.bits;