Commit 6325b4a2 authored by Sunil Mushran's avatar Sunil Mushran Committed by Mark Fasheh
Browse files

ocfs2/dlm: Create debugfs dirs 



This patch creates the debugfs directories that will hold the
files to be used to dump the dlm state.

Signed-off-by: default avatarSunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
Signed-off-by: default avatarMark Fasheh <mfasheh@suse.com>
parent 29576f8b

fs/ocfs2/dlm/dlmcommon.h

+2 −0
Original line number Diff line number Diff line
@@ -123,6 +123,8 @@ struct dlm_ctxt 
	atomic_t remote_resources;

	atomic_t unknown_resources;



	struct dentry *dlm_debugfs_subroot;



	/* NOTE: Next three are protected by dlm_domain_lock */

	struct kref dlm_refs;

	enum dlm_ctxt_state dlm_state;

fs/ocfs2/dlm/dlmdebug.c

+49 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/utsname.h>

#include <linux/sysctl.h>

#include <linux/spinlock.h>

#include <linux/debugfs.h>



#include "cluster/heartbeat.h"

#include "cluster/nodemanager.h"
@@ -37,8 +38,8 @@ 


#include "dlmapi.h"

#include "dlmcommon.h"



#include "dlmdomain.h"

#include "dlmdebug.h"



#define MLOG_MASK_PREFIX ML_DLM

#include "cluster/masklog.h"
@@ -266,3 +267,50 @@ const char *dlm_errname(enum dlm_status err) 
	return dlm_errnames[err];

}

EXPORT_SYMBOL_GPL(dlm_errname);





#ifdef CONFIG_DEBUG_FS



static struct dentry *dlm_debugfs_root = NULL;



#define DLM_DEBUGFS_DIR				"o2dlm"



/* subroot - domain dir */

int dlm_create_debugfs_subroot(struct dlm_ctxt *dlm)

{

	dlm->dlm_debugfs_subroot = debugfs_create_dir(dlm->name,

						      dlm_debugfs_root);

	if (!dlm->dlm_debugfs_subroot) {

		mlog_errno(-ENOMEM);

		goto bail;

	}



	return 0;

bail:

	dlm_destroy_debugfs_subroot(dlm);

	return -ENOMEM;

}



void dlm_destroy_debugfs_subroot(struct dlm_ctxt *dlm)

{

	if (dlm->dlm_debugfs_subroot)

		debugfs_remove(dlm->dlm_debugfs_subroot);

}



/* debugfs root */

int dlm_create_debugfs_root(void)

{

	dlm_debugfs_root = debugfs_create_dir(DLM_DEBUGFS_DIR, NULL);

	if (!dlm_debugfs_root) {

		mlog_errno(-ENOMEM);

		return -ENOMEM;

	}

	return 0;

}



void dlm_destroy_debugfs_root(void)

{

	if (dlm_debugfs_root)

		debugfs_remove(dlm_debugfs_root);

}

#endif	/* CONFIG_DEBUG_FS */

fs/ocfs2/dlm/dlmdebug.h

0 → 100644
+54 −0
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) 2008 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



#ifdef CONFIG_DEBUG_FS



int dlm_create_debugfs_subroot(struct dlm_ctxt *dlm);

void dlm_destroy_debugfs_subroot(struct dlm_ctxt *dlm);



int dlm_create_debugfs_root(void);

void dlm_destroy_debugfs_root(void);



#else



static int dlm_create_debugfs_subroot(struct dlm_ctxt *dlm)

{

	return 0;

}

static void dlm_destroy_debugfs_subroot(struct dlm_ctxt *dlm)

{

}

static int dlm_create_debugfs_root(void)

{

	return 0;

}

static void dlm_destroy_debugfs_root(void)

{

}



#endif	/* CONFIG_DEBUG_FS */

#endif	/* DLMDEBUG_H */

fs/ocfs2/dlm/dlmdomain.c

+20 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/spinlock.h>

#include <linux/delay.h>

#include <linux/err.h>

#include <linux/debugfs.h>



#include "cluster/heartbeat.h"

#include "cluster/nodemanager.h"
@@ -40,8 +41,8 @@ 


#include "dlmapi.h"

#include "dlmcommon.h"



#include "dlmdomain.h"

#include "dlmdebug.h"



#include "dlmver.h"
@@ -298,6 +299,8 @@ static int dlm_wait_on_domain_helper(const char *domain) 


static void dlm_free_ctxt_mem(struct dlm_ctxt *dlm)

{

	dlm_destroy_debugfs_subroot(dlm);



	if (dlm->lockres_hash)

		dlm_free_pagevec((void **)dlm->lockres_hash, DLM_HASH_PAGES);
@@ -1494,6 +1497,7 @@ static struct dlm_ctxt *dlm_alloc_ctxt(const char *domain, 
				u32 key)

{

	int i;

	int ret;

	struct dlm_ctxt *dlm = NULL;



	dlm = kzalloc(sizeof(*dlm), GFP_KERNEL);
@@ -1526,6 +1530,15 @@ static struct dlm_ctxt *dlm_alloc_ctxt(const char *domain, 
	dlm->key = key;

	dlm->node_num = o2nm_this_node();



	ret = dlm_create_debugfs_subroot(dlm);

	if (ret < 0) {

		dlm_free_pagevec((void **)dlm->lockres_hash, DLM_HASH_PAGES);

		kfree(dlm->name);

		kfree(dlm);

		dlm = NULL;

		goto leave;

	}



	spin_lock_init(&dlm->spinlock);

	spin_lock_init(&dlm->master_lock);

	spin_lock_init(&dlm->ast_lock);
@@ -1851,8 +1864,13 @@ static int __init dlm_init(void) 
		goto error;

	}



	status = dlm_create_debugfs_root();

	if (status)

		goto error;



	return 0;

error:

	dlm_unregister_net_handlers();

	dlm_destroy_lock_cache();

	dlm_destroy_master_caches();

	dlm_destroy_mle_cache();
@@ -1861,6 +1879,7 @@ static int __init dlm_init(void) 


static void __exit dlm_exit (void)

{

	dlm_destroy_debugfs_root();

	dlm_unregister_net_handlers();

	dlm_destroy_lock_cache();

	dlm_destroy_master_caches();