Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fb5a989 authored by Adrian Bunk's avatar Adrian Bunk Committed by Mark Fasheh
Browse files

[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: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
parent 43dee336

fs/ocfs2/dlm/dlmdebug.c

+2 −2
Original line number Diff line number Diff line
@@ -37,10 +37,8 @@ 


#include "dlmapi.h"

#include "dlmcommon.h"

#include "dlmdebug.h"



#include "dlmdomain.h"

#include "dlmdebug.h"



#define MLOG_MASK_PREFIX ML_DLM

#include "cluster/masklog.h"
@@ -120,6 +118,7 @@ void dlm_print_one_lock(struct dlm_lock *lockid) 
}

EXPORT_SYMBOL_GPL(dlm_print_one_lock);



#if 0

void dlm_dump_lock_resources(struct dlm_ctxt *dlm)

{

	struct dlm_lock_resource *res;
@@ -142,6 +141,7 @@ void dlm_dump_lock_resources(struct dlm_ctxt *dlm) 
	}

	spin_unlock(&dlm->spinlock);

}

#endif  /*  0  */



static const char *dlm_errnames[] = {

	[DLM_NORMAL] =			"DLM_NORMAL",

fs/ocfs2/dlm/dlmdebug.h

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
/* -*- 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

fs/ocfs2/dlm/dlmdomain.c

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 
#include "dlmapi.h"

#include "dlmcommon.h"



#include "dlmdebug.h"

#include "dlmdomain.h"



#include "dlmver.h"

fs/ocfs2/dlm/dlmmaster.c

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ 


#include "dlmapi.h"

#include "dlmcommon.h"

#include "dlmdebug.h"

#include "dlmdomain.h"



#define MLOG_MASK_PREFIX (ML_DLM|ML_DLM_MASTER)

fs/ocfs2/dlm/dlmrecovery.c

+1 −1
Original line number Diff line number Diff line
@@ -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

 * 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;

	spin_lock(&dlm->spinlock);