LU-4054 llog: don't leak llog handle in llog_cat_process_cb()

[fs/lustre-release.git] / lustre / obdclass / lustre_peer.c

diff --git a/lustre/obdclass/lustre_peer.c b/lustre/obdclass/lustre_peer.c
index 27c8d96..6ee43ab 100644 (file)
--- a/lustre/obdclass/lustre_peer.c
+++ b/lustre/obdclass/lustre_peer.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,6 +26,8 @@
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -57,13 +57,13 @@ struct uuid_nid_data {
 };
 
 /* FIXME: This should probably become more elegant than a global linked list */
-static cfs_list_t           g_uuid_list;
-static cfs_spinlock_t       g_uuid_lock;
+static cfs_list_t      g_uuid_list;
+static spinlock_t      g_uuid_lock;
 
 void class_init_uuidlist(void)
 {
-        CFS_INIT_LIST_HEAD(&g_uuid_list);
-        cfs_spin_lock_init(&g_uuid_lock);
+       CFS_INIT_LIST_HEAD(&g_uuid_list);
+       spin_lock_init(&g_uuid_lock);
 }
 
 void class_exit_uuidlist(void)
@@ -74,25 +74,26 @@ void class_exit_uuidlist(void)
 
 int lustre_uuid_to_peer(const char *uuid, lnet_nid_t *peer_nid, int index)
 {
-        struct uuid_nid_data *data;
-        struct obd_uuid tmp;
-        int rc = -ENOENT;
-
-        obd_str2uuid(&tmp, uuid);
-        cfs_spin_lock(&g_uuid_lock);
-        cfs_list_for_each_entry(data, &g_uuid_list, un_list) {
-                if (obd_uuid_equals(&data->un_uuid, &tmp)) {
-                        if (index >= data->un_nid_count)
-                                break;
-
-                        rc = 0;
-                        *peer_nid = data->un_nids[index];
-                        break;
-                }
-        }
-        cfs_spin_unlock(&g_uuid_lock);
-        return rc;
+       struct uuid_nid_data *data;
+       struct obd_uuid tmp;
+       int rc = -ENOENT;
+
+       obd_str2uuid(&tmp, uuid);
+       spin_lock(&g_uuid_lock);
+       cfs_list_for_each_entry(data, &g_uuid_list, un_list) {
+               if (obd_uuid_equals(&data->un_uuid, &tmp)) {
+                       if (index >= data->un_nid_count)
+                               break;
+
+                       rc = 0;
+                       *peer_nid = data->un_nids[index];
+                       break;
+               }
+       }
+       spin_unlock(&g_uuid_lock);
+       return rc;
 }
+EXPORT_SYMBOL(lustre_uuid_to_peer);
 
 /* Add a nid to a niduuid.  Multiple nids can be added to a single uuid;
    LNET will choose the best one. */
@@ -114,26 +115,26 @@ int class_add_uuid(const char *uuid, __u64 nid)
         data->un_nids[0] = nid;
         data->un_nid_count = 1;
 
-        cfs_spin_lock(&g_uuid_lock);
+       spin_lock(&g_uuid_lock);
         cfs_list_for_each_entry(entry, &g_uuid_list, un_list) {
                 if (obd_uuid_equals(&entry->un_uuid, &data->un_uuid)) {
                         int i;
 
                         found = 1;
-                        for (i = 0; i < data->un_nid_count; i++)
+                        for (i = 0; i < entry->un_nid_count; i++)
                                 if (nid == entry->un_nids[i])
                                         break;
 
-                        if (i == data->un_nid_count) {
-                                LASSERT(data->un_nid_count < NIDS_MAX);
-                                data->un_nids[++data->un_nid_count] = nid;
-                                break;
+                        if (i == entry->un_nid_count) {
+                                LASSERT(entry->un_nid_count < NIDS_MAX);
+                                entry->un_nids[entry->un_nid_count++] = nid;
                         }
+                        break;
                 }
         }
         if (!found)
                 cfs_list_add(&data->un_list, &g_uuid_list);
-        cfs_spin_unlock(&g_uuid_lock);
+       spin_unlock(&g_uuid_lock);
 
         if (found) {
                 CDEBUG(D_INFO, "found uuid %s %s cnt=%d\n", uuid,
@@ -144,14 +145,15 @@ int class_add_uuid(const char *uuid, __u64 nid)
         }
         return 0;
 }
+EXPORT_SYMBOL(class_add_uuid);
 
 /* Delete the nids for one uuid if specified, otherwise delete all */
 int class_del_uuid(const char *uuid)
 {
-        CFS_LIST_HEAD(deathrow);
-        struct uuid_nid_data *data;
+       CFS_LIST_HEAD(deathrow);
+       struct uuid_nid_data *data;
 
-        cfs_spin_lock(&g_uuid_lock);
+       spin_lock(&g_uuid_lock);
         if (uuid != NULL) {
                 struct obd_uuid tmp;
 
@@ -164,7 +166,7 @@ int class_del_uuid(const char *uuid)
                 }
         } else
                 cfs_list_splice_init(&g_uuid_list, &deathrow);
-        cfs_spin_unlock(&g_uuid_lock);
+       spin_unlock(&g_uuid_lock);
 
         if (uuid != NULL && cfs_list_empty(&deathrow)) {
                 CDEBUG(D_INFO, "Try to delete a non-existent uuid %s\n", uuid);
@@ -197,7 +199,7 @@ int class_check_uuid(struct obd_uuid *uuid, __u64 nid)
         CDEBUG(D_INFO, "check if uuid %s has %s.\n",
                obd_uuid2str(uuid), libcfs_nid2str(nid));
 
-        cfs_spin_lock(&g_uuid_lock);
+       spin_lock(&g_uuid_lock);
         cfs_list_for_each_entry(entry, &g_uuid_list, un_list) {
                 int i;
 
@@ -211,8 +213,9 @@ int class_check_uuid(struct obd_uuid *uuid, __u64 nid)
                                 break;
                         }
                 }
+                break;
         }
-        cfs_spin_unlock (&g_uuid_lock);
-        RETURN(found);
+       spin_unlock(&g_uuid_lock);
+       RETURN(found);
 }
 EXPORT_SYMBOL(class_check_uuid);