From: Kevin Corry <kevcorry@us.ibm.com>
To: Andrew Morton <akpm@osdl.org>
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH] 4/5: dm: add static and __init qualifiers
Date: Wed, 26 May 2004 11:59:09 -0500 [thread overview]
Message-ID: <200405261159.09848.kevcorry@us.ibm.com> (raw)
In-Reply-To: <200405261152.33233.kevcorry@us.ibm.com>
DM: Add static and __init qualifiers. [Dave Olien]
--- diff/drivers/md/dm-ioctl.c 2004-05-25 10:13:51.000000000 -0500
+++ source/drivers/md/dm-ioctl.c 2004-05-25 11:01:31.000000000 -0500
@@ -46,7 +46,7 @@
static struct list_head _name_buckets[NUM_BUCKETS];
static struct list_head _uuid_buckets[NUM_BUCKETS];
-void dm_hash_remove_all(void);
+static void dm_hash_remove_all(void);
/*
* Guards access to both hash tables.
@@ -61,7 +61,7 @@
INIT_LIST_HEAD(buckets + i);
}
-int dm_hash_init(void)
+static int dm_hash_init(void)
{
init_buckets(_name_buckets);
init_buckets(_uuid_buckets);
@@ -69,7 +69,7 @@
return 0;
}
-void dm_hash_exit(void)
+static void dm_hash_exit(void)
{
dm_hash_remove_all();
devfs_remove(DM_DIR);
@@ -195,7 +195,7 @@
* The kdev_t and uuid of a device can never change once it is
* initially inserted.
*/
-int dm_hash_insert(const char *name, const char *uuid, struct mapped_device *md)
+static int dm_hash_insert(const char *name, const char *uuid, struct mapped_device *md)
{
struct hash_cell *cell;
@@ -234,7 +234,7 @@
return -EBUSY;
}
-void __hash_remove(struct hash_cell *hc)
+static void __hash_remove(struct hash_cell *hc)
{
/* remove from the dev hash */
list_del(&hc->uuid_list);
@@ -246,7 +246,7 @@
free_cell(hc);
}
-void dm_hash_remove_all(void)
+static void dm_hash_remove_all(void)
{
int i;
struct hash_cell *hc;
@@ -262,7 +262,7 @@
up_write(&_hash_lock);
}
-int dm_hash_rename(const char *old, const char *new)
+static int dm_hash_rename(const char *old, const char *new)
{
char *new_name, *old_name;
struct hash_cell *hc;
--- diff/drivers/md/dm-target.c 2004-05-09 21:33:21.000000000 -0500
+++ source/drivers/md/dm-target.c 2004-05-25 11:01:31.000000000 -0500
@@ -7,6 +7,7 @@
#include "dm.h"
#include <linux/module.h>
+#include <linux/init.h>
#include <linux/kmod.h>
#include <linux/bio.h>
#include <linux/slab.h>
@@ -181,7 +182,7 @@
.map = io_err_map,
};
-int dm_target_init(void)
+int __init dm_target_init(void)
{
return dm_register_target(&error_target);
}
--- diff/drivers/md/dm.c 2004-05-25 10:31:11.000000000 -0500
+++ source/drivers/md/dm.c 2004-05-25 11:01:31.000000000 -0500
@@ -93,7 +93,7 @@
static kmem_cache_t *_io_cache;
static kmem_cache_t *_tio_cache;
-static __init int local_init(void)
+static int __init local_init(void)
{
int r;
@@ -664,6 +664,8 @@
return r;
}
+static struct block_device_operations dm_blk_dops;
+
/*
* Allocate and initialise a blank device with a given minor.
*/
@@ -1087,7 +1089,7 @@
EXPORT_SYMBOL(dm_get_mapinfo);
-struct block_device_operations dm_blk_dops = {
+static struct block_device_operations dm_blk_dops = {
.open = dm_blk_open,
.release = dm_blk_close,
.owner = THIS_MODULE
--- diff/drivers/md/dm.h 2004-05-25 10:20:54.000000000 -0500
+++ source/drivers/md/dm.h 2004-05-25 11:01:31.000000000 -0500
@@ -31,8 +31,6 @@
#define SECTOR_SHIFT 9
-extern struct block_device_operations dm_blk_dops;
-
/*
* List of devices that a metadevice uses and should open/close.
*/
next prev parent reply other threads:[~2004-05-26 17:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-05-26 16:52 [PATCH] 0/5: Device-Mapper bug-fixes and cleanups Kevin Corry
2004-05-26 16:58 ` [PATCH] 1/5: dm-ioctl.c: fix off-by-one error Kevin Corry
2004-05-26 16:58 ` [PATCH] 2/5: dm.c: free cloned bio on error path Kevin Corry
2004-05-26 16:58 ` [PATCH] 3/5: dm-ioctl: replace dm_[add|remove]_wait_queue() with dm_wait_event() Kevin Corry
2004-05-26 16:59 ` Kevin Corry [this message]
2004-05-26 16:59 ` [PATCH] 5/5: dm-table.c: proper usage of dm_vcalloc Kevin Corry
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200405261159.09848.kevcorry@us.ibm.com \
--to=kevcorry@us.ibm.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox