Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 3fb5a9891dbb553dda96783dbc0dc4e77cbb2529

Authored by Adrian Bunk
Committed by Mark Fasheh
1 parent 43dee336c9
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

[PATCH] fs/ocfs2/dlm/: cleanups 

This patch #if 0's the no longer used dlm_dump_lock_resources().

Since this makes dlmdebug.h empty, this patch also removes this header.

Additionally, the needlessly global dlm_is_node_recovered() is made
static.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>

Showing 5 changed files with 3 additions and 35 deletions Side-by-side Diff

fs/ocfs2/dlm/dlmdebug.c
Diff comments   View file @ 3fb5a98
... ... @@ -37,10 +37,8 @@
37 37  
38 38 #include "dlmapi.h"
39 39 #include "dlmcommon.h"
40   -#include "dlmdebug.h"
41 40  
42 41 #include "dlmdomain.h"
43   -#include "dlmdebug.h"
44 42  
45 43 #define MLOG_MASK_PREFIX ML_DLM
46 44 #include "cluster/masklog.h"
... ... @@ -120,6 +118,7 @@
120 118 }
121 119 EXPORT_SYMBOL_GPL(dlm_print_one_lock);
122 120  
  121 +#if 0
123 122 void dlm_dump_lock_resources(struct dlm_ctxt *dlm)
124 123 {
125 124 struct dlm_lock_resource *res;
... ... @@ -142,6 +141,7 @@
142 141 }
143 142 spin_unlock(&dlm->spinlock);
144 143 }
  144 +#endif /* 0 */
145 145  
146 146 static const char *dlm_errnames[] = {
147 147 [DLM_NORMAL] = "DLM_NORMAL",
fs/ocfs2/dlm/dlmdebug.h
View file @ 3fb5a98
1   -/* -*- mode: c; c-basic-offset: 8; -*-
2   - * vim: noexpandtab sw=8 ts=8 sts=0:
3   - *
4   - * dlmdebug.h
5   - *
6   - * Copyright (C) 2004 Oracle. All rights reserved.
7   - *
8   - * This program is free software; you can redistribute it and/or
9   - * modify it under the terms of the GNU General Public
10   - * License as published by the Free Software Foundation; either
11   - * version 2 of the License, or (at your option) any later version.
12   - *
13   - * This program is distributed in the hope that it will be useful,
14   - * but WITHOUT ANY WARRANTY; without even the implied warranty of
15   - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16   - * General Public License for more details.
17   - *
18   - * You should have received a copy of the GNU General Public
19   - * License along with this program; if not, write to the
20   - * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
21   - * Boston, MA 021110-1307, USA.
22   - *
23   - */
24   -
25   -#ifndef DLMDEBUG_H
26   -#define DLMDEBUG_H
27   -
28   -void dlm_dump_lock_resources(struct dlm_ctxt *dlm);
29   -
30   -#endif
fs/ocfs2/dlm/dlmdomain.c
Diff comments   View file @ 3fb5a98
... ... @@ -41,7 +41,6 @@
41 41 #include "dlmapi.h"
42 42 #include "dlmcommon.h"
43 43  
44   -#include "dlmdebug.h"
45 44 #include "dlmdomain.h"
46 45  
47 46 #include "dlmver.h"
fs/ocfs2/dlm/dlmmaster.c
Diff comments   View file @ 3fb5a98
... ... @@ -47,7 +47,6 @@
47 47  
48 48 #include "dlmapi.h"
49 49 #include "dlmcommon.h"
50   -#include "dlmdebug.h"
51 50 #include "dlmdomain.h"
52 51  
53 52 #define MLOG_MASK_PREFIX (ML_DLM|ML_DLM_MASTER)
fs/ocfs2/dlm/dlmrecovery.c
Diff comments   View file @ 3fb5a98
... ... @@ -354,7 +354,7 @@
354 354  
355 355 /* returns true if node is no longer in the domain
356 356 * could be dead or just not joined */
357   -int dlm_is_node_recovered(struct dlm_ctxt *dlm, u8 node)
  357 +static int dlm_is_node_recovered(struct dlm_ctxt *dlm, u8 node)
358 358 {
359 359 int recovered;
360 360 spin_lock(&dlm->spinlock);