LU-4152 mdt: Don't enqueue two locks on the same resource

[fs/lustre-release.git] / lustre / mdt / mdt_fs.c

diff --git a/lustre/mdt/mdt_fs.c b/lustre/mdt/mdt_fs.c
index d2bc968..8621475 100644 (file)
--- a/lustre/mdt/mdt_fs.c
+++ b/lustre/mdt/mdt_fs.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.
@@ -29,8 +27,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011 Whamcloud, Inc.
- *
+ * Copyright (c) 2011, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -40,9 +37,7 @@
  *
  * Lustre Metadata Server (MDS) filesystem interface code
  */
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
+
 #define DEBUG_SUBSYSTEM S_MDS
 
 #include "mdt_internal.h"
@@ -55,6 +50,8 @@ int mdt_export_stats_init(struct obd_device *obd,
         int        rc, newnid;
         ENTRY;
 
+       LASSERT(!obd->obd_uses_nid_stats);
+
         rc = lprocfs_exp_setup(exp, client_nid, &newnid);
         if (rc) {
                 /* Mask error for already created
@@ -65,15 +62,11 @@ int mdt_export_stats_init(struct obd_device *obd,
         }
         if (newnid) {
                 struct nid_stat *tmp = exp->exp_nid_stats;
-                int num_stats;
 
-                num_stats = (sizeof(*obd->obd_type->typ_md_ops) / sizeof(void *)) +
-                            LPROC_MDT_LAST;
-                tmp->nid_stats = lprocfs_alloc_stats(num_stats,
-                                                     LPROCFS_STATS_FLAG_NOPERCPU);
-                if (tmp->nid_stats == NULL)
-                        return -ENOMEM;
-                lprocfs_init_mps_stats(LPROC_MDT_LAST, tmp->nid_stats);
+               tmp->nid_stats = lprocfs_alloc_stats(LPROC_MDT_LAST,
+                                               LPROCFS_STATS_FLAG_NOPERCPU);
+               if (tmp->nid_stats == NULL)
+                       RETURN(-ENOMEM);
                 mdt_stats_counter_init(tmp->nid_stats);
                 rc = lprocfs_register_stats(tmp->nid_proc, "stats",
                                             tmp->nid_stats);