kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] fs/ocfs2/dlm/: cleanups

Browse source 
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>
This commit is contained in:
Adrian Bunk 2006-05-16 17:26:41 +02:00 committed by Mark Fasheh
parent 43dee336c9
commit 3fb5a9891d
5 changed files with 3 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/ocfs2/dlm/dlmdebug.c
View file

@ -37,10 +37,8 @@
#include "dlmapi.h" #include "dlmapi.h"
#include "dlmcommon.h" #include "dlmcommon.h"
#include "dlmdebug.h"
#include "dlmdomain.h" #include "dlmdomain.h"
#include "dlmdebug.h"
#define MLOG_MASK_PREFIX ML_DLM #define MLOG_MASK_PREFIX ML_DLM
#include "cluster/masklog.h" #include "cluster/masklog.h"
@ -120,6 +118,7 @@ void dlm_print_one_lock(struct dlm_lock *lockid)
} }
EXPORT_SYMBOL_GPL(dlm_print_one_lock); EXPORT_SYMBOL_GPL(dlm_print_one_lock);
#if 0
void dlm_dump_lock_resources(struct dlm_ctxt *dlm) void dlm_dump_lock_resources(struct dlm_ctxt *dlm)
{ {
struct dlm_lock_resource *res; struct dlm_lock_resource *res;
@ -142,6 +141,7 @@ void dlm_dump_lock_resources(struct dlm_ctxt *dlm)
} }
spin_unlock(&dlm->spinlock); spin_unlock(&dlm->spinlock);
} }
#endif /* 0 */
static const char *dlm_errnames[] = { static const char *dlm_errnames[] = {
[DLM_NORMAL] = "DLM_NORMAL", [DLM_NORMAL] = "DLM_NORMAL",

30
fs/ocfs2/dlm/dlmdebug.h
View file

@ -1,30 +0,0 @@
/* -*- mode: c; c-basic-offset: 8; -*-
* vim: noexpandtab sw=8 ts=8 sts=0:
*
* dlmdebug.h
*
* Copyright (C) 2004 Oracle. All rights reserved.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 021110-1307, USA.
*
*/
#ifndef DLMDEBUG_H
#define DLMDEBUG_H
void dlm_dump_lock_resources(struct dlm_ctxt *dlm);
#endif

1
fs/ocfs2/dlm/dlmdomain.c
View file

@ -41,7 +41,6 @@
#include "dlmapi.h" #include "dlmapi.h"
#include "dlmcommon.h" #include "dlmcommon.h"
#include "dlmdebug.h"
#include "dlmdomain.h" #include "dlmdomain.h"
#include "dlmver.h" #include "dlmver.h"

1
fs/ocfs2/dlm/dlmmaster.c
View file

@ -47,7 +47,6 @@
#include "dlmapi.h" #include "dlmapi.h"
#include "dlmcommon.h" #include "dlmcommon.h"
#include "dlmdebug.h"
#include "dlmdomain.h" #include "dlmdomain.h"
#define MLOG_MASK_PREFIX (ML_DLM|ML_DLM_MASTER) #define MLOG_MASK_PREFIX (ML_DLM|ML_DLM_MASTER)

2
fs/ocfs2/dlm/dlmrecovery.c
View file

@ -354,7 +354,7 @@ int dlm_is_node_dead(struct dlm_ctxt *dlm, u8 node)
/* returns true if node is no longer in the domain /* returns true if node is no longer in the domain
* could be dead or just not joined */ * could be dead or just not joined */
int dlm_is_node_recovered(struct dlm_ctxt *dlm, u8 node) static int dlm_is_node_recovered(struct dlm_ctxt *dlm, u8 node)
{ {
int recovered; int recovered;
spin_lock(&dlm->spinlock); spin_lock(&dlm->spinlock);