[Oracleasm-commits] jlbec commits r329 - trunk/kernel
svn-commits@oss.oracle.com
svn-commits at oss.oracle.com
Tue Feb 21 17:40:47 CST 2006
Author: jlbec
Date: 2006-02-21 17:40:46 -0600 (Tue, 21 Feb 2006)
New Revision: 329
Added:
trunk/kernel/masklog.c
trunk/kernel/masklog.h
trunk/kernel/proc.c
trunk/kernel/proc.h
Modified:
trunk/kernel/oracleasm.c
Log:
o Add masklog code to the driver.
Added: trunk/kernel/masklog.c
===================================================================
--- trunk/kernel/masklog.c 2006-02-21 22:49:23 UTC (rev 328)
+++ trunk/kernel/masklog.c 2006-02-21 23:40:46 UTC (rev 329)
@@ -0,0 +1,227 @@
+/* -*- mode: c; c-basic-offset: 8; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
+ * Copyright (C) 2004, 2005 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.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/proc_fs.h>
+#include <linux/seq_file.h>
+#include <linux/string.h>
+#include <asm/uaccess.h>
+
+#include "masklog.h"
+
+struct mlog_bits mlog_and_bits = MLOG_BITS_RHS(MLOG_INITIAL_AND_MASK);
+EXPORT_SYMBOL_GPL(mlog_and_bits);
+struct mlog_bits mlog_not_bits = MLOG_BITS_RHS(MLOG_INITIAL_NOT_MASK);
+EXPORT_SYMBOL_GPL(mlog_not_bits);
+
+static char *mlog_bit_names[MLOG_MAX_BITS];
+
+static void *mlog_name_from_pos(loff_t *caller_pos)
+{
+ loff_t pos = *caller_pos;
+ while (pos < ARRAY_SIZE(mlog_bit_names) && mlog_bit_names[pos] == NULL)
+ pos++;
+
+ if (pos >= ARRAY_SIZE(mlog_bit_names))
+ return NULL;
+
+ *caller_pos = pos;
+ return &mlog_bit_names[pos];
+}
+
+static void *mlog_seq_start(struct seq_file *seq, loff_t *pos)
+{
+ return mlog_name_from_pos(pos);
+}
+
+static void *mlog_seq_next(struct seq_file *seq, void *v, loff_t *pos)
+{
+ (*pos)++;
+ return mlog_name_from_pos(pos);
+}
+
+static int mlog_seq_show(struct seq_file *seq, void *v)
+{
+ char **name = v;
+ int bit = name - mlog_bit_names;
+ char *state;
+
+ if (__mlog_test_u64((u64)1 << bit, mlog_and_bits))
+ state = "allow";
+ else if (__mlog_test_u64((u64)1 << bit, mlog_not_bits))
+ state = "deny";
+ else
+ state = "off";
+
+ seq_printf(seq, "%s %s\n", *name, state);
+ return 0;
+}
+
+static void mlog_seq_stop(struct seq_file *p, void *v)
+{
+}
+
+static struct seq_operations mlog_seq_ops = {
+ .start = mlog_seq_start,
+ .next = mlog_seq_next,
+ .stop = mlog_seq_stop,
+ .show = mlog_seq_show,
+};
+
+static int mlog_fop_open(struct inode *inode, struct file *file)
+{
+ return seq_open(file, &mlog_seq_ops);
+}
+
+static ssize_t mlog_fop_write(struct file *filp, const char __user *buf,
+ size_t count, loff_t *pos)
+{
+ char *name;
+ char str[32], *mask, *val;
+ unsigned i, masklen, namelen;
+
+ if (count == 0)
+ return 0;
+
+ /* count at least mask + space + 3 for "off" */
+ if (*pos != 0 || count < 5 || count >= sizeof(str))
+ return -EINVAL;
+
+ if (copy_from_user(str, buf, count))
+ return -EFAULT;
+
+ str[count] = '\0';
+
+ mask = str;
+ val = strchr(str, ' ');
+ if (val == NULL)
+ return -EINVAL;
+ *val = '\0';
+ val++;
+
+ if (strlen(val) == 0)
+ return -EINVAL;
+
+ masklen = strlen(mask);
+
+ for (i = 0; i < ARRAY_SIZE(mlog_bit_names); i++) {
+ name = mlog_bit_names[i];
+
+ if (name == NULL)
+ continue;
+
+ namelen = strlen(name);
+
+ if (namelen != masklen
+ || strnicmp(mask, name, namelen))
+ continue;
+ break;
+ }
+ if (i == ARRAY_SIZE(mlog_bit_names))
+ return -EINVAL;
+
+ if (!strnicmp(val, "allow", 5)) {
+ __mlog_set_u64((u64)1 << i, mlog_and_bits);
+ __mlog_clear_u64((u64)1 << i, mlog_not_bits);
+ } else if (!strnicmp(val, "deny", 4)) {
+ __mlog_set_u64((u64)1 << i, mlog_not_bits);
+ __mlog_clear_u64((u64)1 << i, mlog_and_bits);
+ } else if (!strnicmp(val, "off", 3)) {
+ __mlog_clear_u64((u64)1 << i, mlog_not_bits);
+ __mlog_clear_u64((u64)1 << i, mlog_and_bits);
+ } else
+ return -EINVAL;
+
+ *pos += count;
+ return count;
+}
+
+static struct file_operations mlog_seq_fops = {
+ .owner = THIS_MODULE,
+ .open = mlog_fop_open,
+ .read = seq_read,
+ .write = mlog_fop_write,
+ .llseek = seq_lseek,
+ .release = seq_release,
+};
+
+#define set_a_string(which) do { \
+ struct mlog_bits _bits = {{0,}, }; \
+ int _bit; \
+ __mlog_set_u64(ML_##which, _bits); \
+ _bit = find_first_bit(_bits.words, MLOG_MAX_BITS); \
+ mlog_bit_names[_bit] = #which; \
+} while (0)
+
+#define LOGMASK_PROC_NAME "log_mask"
+
+void mlog_remove_proc(struct proc_dir_entry *parent)
+{
+ remove_proc_entry(LOGMASK_PROC_NAME, parent);
+}
+
+int mlog_init_proc(struct proc_dir_entry *parent)
+{
+ struct proc_dir_entry *p;
+
+ set_a_string(ENTRY);
+ set_a_string(EXIT);
+ set_a_string(TCP);
+ set_a_string(MSG);
+ set_a_string(SOCKET);
+ set_a_string(HEARTBEAT);
+ set_a_string(HB_BIO);
+ set_a_string(DLMFS);
+ set_a_string(DLM);
+ set_a_string(DLM_DOMAIN);
+ set_a_string(DLM_THREAD);
+ set_a_string(DLM_MASTER);
+ set_a_string(DLM_RECOVERY);
+ set_a_string(AIO);
+ set_a_string(JOURNAL);
+ set_a_string(DISK_ALLOC);
+ set_a_string(SUPER);
+ set_a_string(FILE_IO);
+ set_a_string(EXTENT_MAP);
+ set_a_string(DLM_GLUE);
+ set_a_string(BH_IO);
+ set_a_string(UPTODATE);
+ set_a_string(NAMEI);
+ set_a_string(INODE);
+ set_a_string(VOTE);
+ set_a_string(DCACHE);
+ set_a_string(CONN);
+ set_a_string(QUORUM);
+ set_a_string(EXPORT);
+ set_a_string(ERROR);
+ set_a_string(NOTICE);
+ set_a_string(KTHREAD);
+
+ p = create_proc_entry(LOGMASK_PROC_NAME, S_IRUGO, parent);
+ if (p == NULL)
+ return -ENOMEM;
+
+ p->proc_fops = &mlog_seq_fops;
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(mlog_init_proc);
Added: trunk/kernel/masklog.h
===================================================================
--- trunk/kernel/masklog.h 2006-02-21 22:49:23 UTC (rev 328)
+++ trunk/kernel/masklog.h 2006-02-21 23:40:46 UTC (rev 329)
@@ -0,0 +1,272 @@
+/* -*- mode: c; c-basic-offset: 8; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
+ * Copyright (C) 2005 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 O2CLUSTER_MASKLOG_H
+#define O2CLUSTER_MASKLOG_H
+
+/*
+ * For now this is a trivial wrapper around printk() that gives the critical
+ * ability to enable sets of debugging output at run-time. In the future this
+ * will almost certainly be redirected to relayfs so that it can pay a
+ * substantially lower heisenberg tax.
+ *
+ * Callers associate the message with a bitmask and a global bitmask is
+ * maintained with help from /proc. If any of the bits match the message is
+ * output.
+ *
+ * We must have efficient bit tests on i386 and it seems gcc still emits crazy
+ * code for the 64bit compare. It emits very good code for the dual unsigned
+ * long tests, though, completely avoiding tests that can never pass if the
+ * caller gives a constant bitmask that fills one of the longs with all 0s. So
+ * the desire is to have almost all of the calls decided on by comparing just
+ * one of the longs. This leads to having infrequently given bits that are
+ * frequently matched in the high bits.
+ *
+ * _ERROR and _NOTICE are used for messages that always go to the console and
+ * have appropriate KERN_ prefixes. We wrap these in our function instead of
+ * just calling printk() so that this can eventually make its way through
+ * relayfs along with the debugging messages. Everything else gets KERN_DEBUG.
+ * The inline tests and macro dance give GCC the opportunity to quite cleverly
+ * only emit the appropriage printk() when the caller passes in a constant
+ * mask, as is almost always the case.
+ *
+ * All this bitmask nonsense is hidden from the /proc interface so that Joel
+ * doesn't have an aneurism. Reading the file gives a straight forward
+ * indication of which bits are on or off:
+ * ENTRY off
+ * EXIT off
+ * TCP off
+ * MSG off
+ * SOCKET off
+ * ERROR off
+ * NOTICE on
+ *
+ * Writing changes the state of a given bit and requires a strictly formatted
+ * single write() call:
+ *
+ * write(fd, "ENTRY on", 8);
+ *
+ * would turn the entry bit on. "1" is also accepted in the place of "on", and
+ * "off" and "0" behave as expected.
+ *
+ * Some trivial shell can flip all the bits on or off:
+ *
+ * log_mask="/proc/fs/ocfs2_nodemanager/log_mask"
+ * cat $log_mask | (
+ * while read bit status; do
+ * # $1 is "on" or "off", say
+ * echo "$bit $1" > $log_mask
+ * done
+ * )
+ */
+
+/* for task_struct */
+#include <linux/sched.h>
+
+/* bits that are frequently given and infrequently matched in the low word */
+/* NOTE: If you add a flag, you need to also update mlog.c! */
+#define ML_ENTRY 0x0000000000000001ULL /* func call entry */
+#define ML_EXIT 0x0000000000000002ULL /* func call exit */
+#define ML_TCP 0x0000000000000004ULL /* net cluster/tcp.c */
+#define ML_MSG 0x0000000000000008ULL /* net network messages */
+#define ML_SOCKET 0x0000000000000010ULL /* net socket lifetime */
+#define ML_HEARTBEAT 0x0000000000000020ULL /* hb all heartbeat tracking */
+#define ML_HB_BIO 0x0000000000000040ULL /* hb io tracing */
+#define ML_DLMFS 0x0000000000000080ULL /* dlm user dlmfs */
+#define ML_DLM 0x0000000000000100ULL /* dlm general debugging */
+#define ML_DLM_DOMAIN 0x0000000000000200ULL /* dlm domain debugging */
+#define ML_DLM_THREAD 0x0000000000000400ULL /* dlm domain thread */
+#define ML_DLM_MASTER 0x0000000000000800ULL /* dlm master functions */
+#define ML_DLM_RECOVERY 0x0000000000001000ULL /* dlm master functions */
+#define ML_AIO 0x0000000000002000ULL /* ocfs2 aio read and write */
+#define ML_JOURNAL 0x0000000000004000ULL /* ocfs2 journalling functions */
+#define ML_DISK_ALLOC 0x0000000000008000ULL /* ocfs2 disk allocation */
+#define ML_SUPER 0x0000000000010000ULL /* ocfs2 mount / umount */
+#define ML_FILE_IO 0x0000000000020000ULL /* ocfs2 file I/O */
+#define ML_EXTENT_MAP 0x0000000000040000ULL /* ocfs2 extent map caching */
+#define ML_DLM_GLUE 0x0000000000080000ULL /* ocfs2 dlm glue layer */
+#define ML_BH_IO 0x0000000000100000ULL /* ocfs2 buffer I/O */
+#define ML_UPTODATE 0x0000000000200000ULL /* ocfs2 caching sequence #'s */
+#define ML_NAMEI 0x0000000000400000ULL /* ocfs2 directory / namespace */
+#define ML_INODE 0x0000000000800000ULL /* ocfs2 inode manipulation */
+#define ML_VOTE 0x0000000001000000ULL /* ocfs2 node messaging */
+#define ML_DCACHE 0x0000000002000000ULL /* ocfs2 dcache operations */
+#define ML_CONN 0x0000000004000000ULL /* net connection management */
+#define ML_QUORUM 0x0000000008000000ULL /* net connection quorum */
+#define ML_EXPORT 0x0000000010000000ULL /* ocfs2 export operations */
+/* bits that are infrequently given and frequently matched in the high word */
+#define ML_ERROR 0x0000000100000000ULL /* sent to KERN_ERR */
+#define ML_NOTICE 0x0000000200000000ULL /* setn to KERN_NOTICE */
+#define ML_KTHREAD 0x0000000400000000ULL /* kernel thread activity */
+
+#define MLOG_INITIAL_AND_MASK (ML_ERROR|ML_NOTICE)
+#define MLOG_INITIAL_NOT_MASK (ML_ENTRY|ML_EXIT)
+#ifndef MLOG_MASK_PREFIX
+#define MLOG_MASK_PREFIX 0
+#endif
+
+#define MLOG_MAX_BITS 64
+
+struct mlog_bits {
+ unsigned long words[MLOG_MAX_BITS / BITS_PER_LONG];
+};
+
+extern struct mlog_bits mlog_and_bits, mlog_not_bits;
+
+#if BITS_PER_LONG == 32
+
+#define __mlog_test_u64(mask, bits) \
+ ( (u32)(mask & 0xffffffff) & bits.words[0] || \
+ ((u64)(mask) >> 32) & bits.words[1] )
+#define __mlog_set_u64(mask, bits) do { \
+ bits.words[0] |= (u32)(mask & 0xffffffff); \
+ bits.words[1] |= (u64)(mask) >> 32; \
+} while (0)
+#define __mlog_clear_u64(mask, bits) do { \
+ bits.words[0] &= ~((u32)(mask & 0xffffffff)); \
+ bits.words[1] &= ~((u64)(mask) >> 32); \
+} while (0)
+#define MLOG_BITS_RHS(mask) { \
+ { \
+ [0] = (u32)(mask & 0xffffffff), \
+ [1] = (u64)(mask) >> 32, \
+ } \
+}
+
+#else /* 32bit long above, 64bit long below */
+
+#define __mlog_test_u64(mask, bits) ((mask) & bits.words[0])
+#define __mlog_set_u64(mask, bits) do { \
+ bits.words[0] |= (mask); \
+} while (0)
+#define __mlog_clear_u64(mask, bits) do { \
+ bits.words[0] &= ~(mask); \
+} while (0)
+#define MLOG_BITS_RHS(mask) { { (mask) } }
+
+#endif
+
+/*
+ * smp_processor_id() "helpfully" screams when called outside preemptible
+ * regions in current kernels. sles doesn't have the variants that don't
+ * scream. just do this instead of trying to guess which we're building
+ * against.. *sigh*.
+ */
+#define __mlog_cpu_guess ({ \
+ unsigned long _cpu = get_cpu(); \
+ put_cpu(); \
+ _cpu; \
+})
+
+/* In the following two macros, the whitespace after the ',' just
+ * before ##args is intentional. Otherwise, gcc 2.95 will eat the
+ * previous token if args expands to nothing.
+ */
+#define __mlog_printk(level, fmt, args...) \
+ printk(level "(%u,%lu):%s:%d " fmt, current->pid, \
+ __mlog_cpu_guess, __PRETTY_FUNCTION__, __LINE__ , \
+ ##args)
+
+#define mlog(mask, fmt, args...) do { \
+ u64 __m = MLOG_MASK_PREFIX | (mask); \
+ if (__mlog_test_u64(__m, mlog_and_bits) && \
+ !__mlog_test_u64(__m, mlog_not_bits)) { \
+ if (__m & ML_ERROR) \
+ __mlog_printk(KERN_ERR, "ERROR: "fmt , ##args); \
+ else if (__m & ML_NOTICE) \
+ __mlog_printk(KERN_NOTICE, fmt , ##args); \
+ else __mlog_printk(KERN_INFO, fmt , ##args); \
+ } \
+} while (0)
+
+#define mlog_errno(st) do { \
+ if ((st) != -ERESTARTSYS && (st) != -EINTR) \
+ mlog(ML_ERROR, "status = %lld\n", (long long)(st)); \
+} while (0)
+
+#define mlog_entry(fmt, args...) do { \
+ mlog(ML_ENTRY, "ENTRY:" fmt , ##args); \
+} while (0)
+
+#define mlog_entry_void() do { \
+ mlog(ML_ENTRY, "ENTRY:\n"); \
+} while (0)
+
+/* We disable this for old compilers since they don't have support for
+ * __builtin_types_compatible_p.
+ */
+#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) && \
+ !defined(__CHECKER__)
+#define mlog_exit(st) do { \
+ if (__builtin_types_compatible_p(typeof(st), unsigned long)) \
+ mlog(ML_EXIT, "EXIT: %lu\n", (unsigned long) (st)); \
+ else if (__builtin_types_compatible_p(typeof(st), signed long)) \
+ mlog(ML_EXIT, "EXIT: %ld\n", (signed long) (st)); \
+ else if (__builtin_types_compatible_p(typeof(st), unsigned int) \
+ || __builtin_types_compatible_p(typeof(st), unsigned short) \
+ || __builtin_types_compatible_p(typeof(st), unsigned char)) \
+ mlog(ML_EXIT, "EXIT: %u\n", (unsigned int) (st)); \
+ else if (__builtin_types_compatible_p(typeof(st), signed int) \
+ || __builtin_types_compatible_p(typeof(st), signed short) \
+ || __builtin_types_compatible_p(typeof(st), signed char)) \
+ mlog(ML_EXIT, "EXIT: %d\n", (signed int) (st)); \
+ else if (__builtin_types_compatible_p(typeof(st), long long)) \
+ mlog(ML_EXIT, "EXIT: %lld\n", (long long) (st)); \
+ else \
+ mlog(ML_EXIT, "EXIT: %llu\n", (unsigned long long) (st)); \
+} while (0)
+#else
+#define mlog_exit(st) do { \
+ mlog(ML_EXIT, "EXIT: %lld\n", (long long) (st)); \
+} while (0)
+#endif
+
+#define mlog_exit_ptr(ptr) do { \
+ mlog(ML_EXIT, "EXIT: %p\n", ptr); \
+} while (0)
+
+#define mlog_exit_void() do { \
+ mlog(ML_EXIT, "EXIT\n"); \
+} while (0)
+
+#define mlog_bug_on_msg(cond, fmt, args...) do { \
+ if (cond) { \
+ mlog(ML_ERROR, "bug expression: " #cond "\n"); \
+ mlog(ML_ERROR, fmt, ##args); \
+ BUG(); \
+ } \
+} while (0)
+
+#if (BITS_PER_LONG == 32) || defined(CONFIG_X86_64)
+#define MLFi64 "lld"
+#define MLFu64 "llu"
+#define MLFx64 "llx"
+#else
+#define MLFi64 "ld"
+#define MLFu64 "lu"
+#define MLFx64 "lx"
+#endif
+
+#include <linux/proc_fs.h>
+int mlog_init_proc(struct proc_dir_entry *parent);
+void mlog_remove_proc(struct proc_dir_entry *parent);
+
+#endif /* O2CLUSTER_MASKLOG_H */
Modified: trunk/kernel/oracleasm.c
===================================================================
--- trunk/kernel/oracleasm.c 2006-02-21 22:49:23 UTC (rev 328)
+++ trunk/kernel/oracleasm.c 2006-02-21 23:40:46 UTC (rev 329)
@@ -80,10 +80,14 @@
#include "linux/asm_module_version.h"
+#include "masklog.h"
+#include "proc.h"
#if 0
#include "transaction_file.h"
#else
-#include "transaction_file.c" /* XXX ugly for now */
+/* XXX ugly for now */
+#include "transaction_file.c"
+#include "proc.c"
#endif
#if PAGE_CACHE_SIZE % 1024
@@ -2655,6 +2659,12 @@
goto out_diskcache;
}
+ ret = init_oracleasm_proc();
+ if (ret) {
+ printk("oracleasmfs: Unable to register proc entries\n");
+ goto out_proc;
+ }
+
init_asmfs_dir_operations();
ret = register_filesystem(&asmfs_fs_type);
if (ret) {
@@ -2665,6 +2675,9 @@
return 0;
out_register:
+ exit_oracleasm_proc();
+
+out_proc:
destroy_asmdiskcache();
out_diskcache:
@@ -2680,6 +2693,7 @@
static void __exit exit_asmfs_fs(void)
{
unregister_filesystem(&asmfs_fs_type);
+ exit_oracleasm_proc();
destroy_asmdiskcache();
destroy_requestcache();
destroy_inodecache();
Added: trunk/kernel/proc.c
===================================================================
--- trunk/kernel/proc.c 2006-02-21 22:49:23 UTC (rev 328)
+++ trunk/kernel/proc.c 2006-02-21 23:40:46 UTC (rev 329)
@@ -0,0 +1,55 @@
+/* -*- mode: c; c-basic-offset: 8; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
+ * Copyright (C) 2006 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, version 2.
+ *
+ * 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.
+ */
+
+#include <linux/module.h>
+#include <linux/proc_fs.h>
+
+#include "proc.h"
+#include "masklog.h"
+
+/* Yuk, but whatever */
+#include "masklog.c"
+
+static struct proc_dir_entry *asm_proc;
+#define ASM_PROC_PATH "fs/oracleasm"
+
+int init_oracleasm_proc(void)
+{
+ int rc;
+
+ asm_proc = proc_mkdir(ASM_PROC_PATH, NULL);
+ if (asm_proc == NULL) {
+ rc = -ENOMEM; /* shrug */
+ goto out;
+ }
+
+ rc = mlog_init_proc(asm_proc);
+ if (rc)
+ remove_proc_entry(ASM_PROC_PATH, NULL);
+
+out:
+ return rc;
+}
+
+void exit_oracleasm_proc(void)
+{
+ mlog_remove_proc(asm_proc);
+ remove_proc_entry(ASM_PROC_PATH, NULL);
+}
Added: trunk/kernel/proc.h
===================================================================
--- trunk/kernel/proc.h 2006-02-21 22:49:23 UTC (rev 328)
+++ trunk/kernel/proc.h 2006-02-21 23:40:46 UTC (rev 329)
@@ -0,0 +1,27 @@
+/* -*- mode: c; c-basic-offset: 8; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
+ * Copyright (C) 2006 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, version 2.
+ *
+ * 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 __ASM_PROC_H
+#define __ASM_PROC_H
+
+int init_oracleasm_proc(void);
+void exit_oracleasm_proc(void);
+
+#endif /* _ASM_PROC_H */
More information about the Oracleasm-commits
mailing list