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

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

staging/lustre: Get rid of ldlm_ns_type_t typedef 



Replace it with enum ldlm_ns_type

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

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

+3 −3
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ enum { 
	LDLM_NSS_LAST

};



typedef enum {

enum ldlm_ns_type {

	/** invalid type */

	LDLM_NS_TYPE_UNKNOWN    = 0,

	/** mdc namespace */
@@ -333,7 +333,7 @@ typedef enum { 
	LDLM_NS_TYPE_MGC,

	/** mgs namespace */

	LDLM_NS_TYPE_MGT,

} ldlm_ns_type_t;

};



/**

 * LDLM Namespace.
@@ -1177,7 +1177,7 @@ void ldlm_unlink_lock_skiplist(struct ldlm_lock *req); 
struct ldlm_namespace *

ldlm_namespace_new(struct obd_device *obd, char *name,

		   ldlm_side_t client, enum ldlm_appetite apt,

		   ldlm_ns_type_t ns_type);

		   enum ldlm_ns_type ns_type);

int ldlm_namespace_cleanup(struct ldlm_namespace *ns, __u64 flags);

void ldlm_namespace_get(struct ldlm_namespace *ns);

void ldlm_namespace_put(struct ldlm_namespace *ns);

drivers/staging/lustre/lustre/ldlm/ldlm_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg) 
	struct obd_uuid server_uuid;

	int rq_portal, rp_portal, connect_op;

	char *name = obddev->obd_type->typ_name;

	ldlm_ns_type_t ns_type = LDLM_NS_TYPE_UNKNOWN;

	enum ldlm_ns_type ns_type = LDLM_NS_TYPE_UNKNOWN;

	int rc;



	/* In a more perfect world, we would hang a ptlrpc_client off of

drivers/staging/lustre/lustre/ldlm/ldlm_resource.c

+2 −2
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ static struct cfs_hash_ops ldlm_ns_fid_hash_ops = { 
};



struct ldlm_ns_hash_def {

	ldlm_ns_type_t  nsd_type;

	enum ldlm_ns_type nsd_type;

	/** hash bucket bits */

	unsigned	nsd_bkt_bits;

	/** hash bits */
@@ -622,7 +622,7 @@ static void ldlm_namespace_register(struct ldlm_namespace *ns, 
struct ldlm_namespace *ldlm_namespace_new(struct obd_device *obd, char *name,

					  ldlm_side_t client,

					  enum ldlm_appetite apt,

					  ldlm_ns_type_t ns_type)

					  enum ldlm_ns_type ns_type)

{

	struct ldlm_namespace *ns = NULL;

	struct ldlm_ns_bucket *nsb;