The patch titled
dlm: cleanup unused functions
has been removed from the -mm tree. Its filename is
dlm-cleanup-unused-functions.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: David Teigland <teigland@xxxxxxxxxx>
Remove some unused functions and make others static.
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Signed-off-by: David Teigland <teigland@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
Cc: Steven Whitehouse <swhiteho@xxxxxxxxxx>
---
dev/null | 21 ---------------------
drivers/dlm/device.c | 25 ++-----------------------
drivers/dlm/lock.c | 7 +------
drivers/dlm/lock.h | 2 --
drivers/dlm/lockspace.c | 9 ++-------
drivers/dlm/lockspace.h | 1 -
6 files changed, 5 insertions(+), 60 deletions(-)
diff -puN drivers/dlm/device.c~dlm-cleanup-unused-functions drivers/dlm/device.c
--- devel/drivers/dlm/device.c~dlm-cleanup-unused-functions 2006-01-23 16:41:50.000000000 -0800
+++ devel-akpm/drivers/dlm/device.c 2006-01-23 16:41:50.000000000 -0800
@@ -39,7 +39,6 @@
#include <linux/dlm_device.h>
#include "lvb_table.h"
-#include "device.h"
static struct file_operations _dlm_fops;
static const char *name_prefix="dlm";
@@ -1043,26 +1042,6 @@ static ssize_t dlm_write(struct file *fi
return status;
}
-/* Called when the cluster is shutdown uncleanly, all lockspaces
- have been summarily removed */
-void dlm_device_free_devices()
-{
- struct user_ls *tmp;
- struct user_ls *lsinfo;
-
- down(&user_ls_lock);
- list_for_each_entry_safe(lsinfo, tmp, &user_ls_list, ls_list) {
- misc_deregister(&lsinfo->ls_miscinfo);
-
- /* Tidy up, but don't delete the lsinfo struct until
- all the users have closed their devices */
- list_del(&lsinfo->ls_list);
- set_bit(LS_FLAG_DELETED, &lsinfo->ls_flags);
- lsinfo->ls_lockspace = NULL;
- }
- up(&user_ls_lock);
-}
-
static struct file_operations _dlm_fops = {
.open = dlm_open,
.release = dlm_close,
@@ -1082,7 +1061,7 @@ static struct file_operations _dlm_ctl_f
/*
* Create control device
*/
-int __init dlm_device_init(void)
+static int __init dlm_device_init(void)
{
int r;
@@ -1103,7 +1082,7 @@ int __init dlm_device_init(void)
return 0;
}
-void __exit dlm_device_exit(void)
+static void __exit dlm_device_exit(void)
{
misc_deregister(&ctl_device);
}
diff -L drivers/dlm/device.h -puN drivers/dlm/device.h~dlm-cleanup-unused-functions /dev/null
--- devel/drivers/dlm/device.h
+++ /dev/null 2003-09-15 06:40:47.000000000 -0700
@@ -1,21 +0,0 @@
-/******************************************************************************
-*******************************************************************************
-**
-** Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
-** Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved.
-**
-** This copyrighted material is made available to anyone wishing to use,
-** modify, copy, or redistribute it subject to the terms and conditions
-** of the GNU General Public License v.2.
-**
-*******************************************************************************
-******************************************************************************/
-
-#ifndef __DEVICE_DOT_H__
-#define __DEVICE_DOT_H__
-
-extern void dlm_device_free_devices(void);
-extern int dlm_device_init(void);
-extern void dlm_device_exit(void);
-#endif /* __DEVICE_DOT_H__ */
-
diff -puN drivers/dlm/lock.c~dlm-cleanup-unused-functions drivers/dlm/lock.c
--- devel/drivers/dlm/lock.c~dlm-cleanup-unused-functions 2006-01-23 16:41:50.000000000 -0800
+++ devel-akpm/drivers/dlm/lock.c 2006-01-23 16:41:50.000000000 -0800
@@ -152,7 +152,7 @@ static const int __quecvt_compat_matrix[
{0, 0, 0, 0, 0, 0, 0, 0} /* PD */
};
-void dlm_print_lkb(struct dlm_lkb *lkb)
+static void dlm_print_lkb(struct dlm_lkb *lkb)
{
printk(KERN_ERR "lkb: nodeid %d id %x remid %x exflags %x flags %x\n"
" status %d rqmode %d grmode %d wait_type %d ast_type %d\n",
@@ -751,11 +751,6 @@ static int remove_from_waiters(struct dl
return error;
}
-int dlm_remove_from_waiters(struct dlm_lkb *lkb)
-{
- return remove_from_waiters(lkb);
-}
-
static void dir_remove(struct dlm_rsb *r)
{
int to_nodeid;
diff -puN drivers/dlm/lock.h~dlm-cleanup-unused-functions drivers/dlm/lock.h
--- devel/drivers/dlm/lock.h~dlm-cleanup-unused-functions 2006-01-23 16:41:50.000000000 -0800
+++ devel-akpm/drivers/dlm/lock.h 2006-01-23 16:41:50.000000000 -0800
@@ -13,7 +13,6 @@
#ifndef __LOCK_DOT_H__
#define __LOCK_DOT_H__
-void dlm_print_lkb(struct dlm_lkb *lkb);
void dlm_print_rsb(struct dlm_rsb *r);
int dlm_receive_message(struct dlm_header *hd, int nodeid, int recovery);
int dlm_modes_compat(int mode1, int mode2);
@@ -22,7 +21,6 @@ int dlm_find_rsb(struct dlm_ls *ls, char
void dlm_put_rsb(struct dlm_rsb *r);
void dlm_hold_rsb(struct dlm_rsb *r);
int dlm_put_lkb(struct dlm_lkb *lkb);
-int dlm_remove_from_waiters(struct dlm_lkb *lkb);
void dlm_scan_rsbs(struct dlm_ls *ls);
int dlm_purge_locks(struct dlm_ls *ls);
diff -puN drivers/dlm/lockspace.c~dlm-cleanup-unused-functions drivers/dlm/lockspace.c
--- devel/drivers/dlm/lockspace.c~dlm-cleanup-unused-functions 2006-01-23 16:41:50.000000000 -0800
+++ devel-akpm/drivers/dlm/lockspace.c 2006-01-23 16:41:50.000000000 -0800
@@ -222,7 +222,7 @@ static void dlm_scand_stop(void)
kthread_stop(scand_task);
}
-static struct dlm_ls *find_lockspace_name(char *name, int namelen)
+static struct dlm_ls *dlm_find_lockspace_name(char *name, int namelen)
{
struct dlm_ls *ls;
@@ -239,11 +239,6 @@ static struct dlm_ls *find_lockspace_nam
return ls;
}
-struct dlm_ls *dlm_find_lockspace_name(char *name, int namelen)
-{
- return find_lockspace_name(name, namelen);
-}
-
struct dlm_ls *dlm_find_lockspace_global(uint32_t id)
{
struct dlm_ls *ls;
@@ -349,7 +344,7 @@ static int new_lockspace(char *name, int
if (!try_module_get(THIS_MODULE))
return -EINVAL;
- ls = find_lockspace_name(name, namelen);
+ ls = dlm_find_lockspace_name(name, namelen);
if (ls) {
*lockspace = ls;
module_put(THIS_MODULE);
diff -puN drivers/dlm/lockspace.h~dlm-cleanup-unused-functions drivers/dlm/lockspace.h
--- devel/drivers/dlm/lockspace.h~dlm-cleanup-unused-functions 2006-01-23 16:41:50.000000000 -0800
+++ devel-akpm/drivers/dlm/lockspace.h 2006-01-23 16:41:50.000000000 -0800
@@ -18,7 +18,6 @@ int dlm_lockspace_init(void);
void dlm_lockspace_exit(void);
struct dlm_ls *dlm_find_lockspace_global(uint32_t id);
struct dlm_ls *dlm_find_lockspace_local(void *id);
-struct dlm_ls *dlm_find_lockspace_name(char *name, int namelen);
void dlm_put_lockspace(struct dlm_ls *ls);
#endif /* __LOCKSPACE_DOT_H__ */
_
Patches currently in -mm which might be from teigland@xxxxxxxxxx are
git-gfs2.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
