staging/lustre: Get rid of ldlm_ns_type_t typedef

Replace it with enum ldlm_ns_type

Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
index 0f229b9e9916f27a11c57c990d052b33d269b01e..ab40bc7edb290dc870fbb30ed7f9e02a1703c427 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
@@ -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);

diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
index c22370b19f1c9de0a679c1c21b5ec8d87c32f9d0..d0ad28d8a004938a66e572bf0aaf31200baf857a 100644 (file)
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
@@ -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

diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
index 582cb21da2915dc89240d7093cad96a4d58dbf8c..9ab4452321bfabe79e37ba8d7c404d0070f7ca37 100644 (file)
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
@@ -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;