test commit

[fs/lustre-release.git] / lustre / snapfs / psdev.c

diff --git a/lustre/snapfs/psdev.c b/lustre/snapfs/psdev.c
index 424d325..33b7608 100644 (file)
--- a/lustre/snapfs/psdev.c
+++ b/lustre/snapfs/psdev.c
@@ -12,46 +12,26 @@
 
 #define EXPORT_SYMTAB
 
-#include <linux/config.h> /* for CONFIG_PROC_FS */
+
+#define DEBUG_SUBSYSTEM S_SNAP
+
 #include <linux/module.h>
-#include <linux/errno.h>
 #include <linux/kernel.h>
-#include <linux/major.h>
-/* #include <linux/kmod.h>    for request_module() */
-#include <linux/sched.h>
-#include <linux/lp.h>
-#include <linux/malloc.h>
-#include <linux/ioport.h>
-#include <linux/fcntl.h>
-#include <linux/delay.h>
-#include <linux/skbuff.h>
-#include <linux/proc_fs.h>
-#include <linux/vmalloc.h>
-#include <linux/fs.h>
-#include <linux/poll.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <asm/io.h>
-#include <asm/segment.h>
-#include <asm/system.h>
-#include <asm/poll.h>
-#include <asm/uaccess.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/stat.h>
+#include <linux/unistd.h>
 #include <linux/miscdevice.h>
+#include <linux/jbd.h>
+#include <linux/ext3_fs.h>
+#include <linux/snap.h>
 
-#include <linux/filter.h>
-#include <linux/snapfs.h>
-#include <linux/snapsupport.h>
-
-#if 1 /* XXX - enable for debug messages */
-int snap_print_entry = 1;
-int snap_debug_level = ~D_INFO;
-#else
-int snap_print_entry = 0;
-int snap_debug_level = 0;
-#endif
-int snap_inodes = 0;
-long snap_memory = 0;
+#include "snapfs_internal.h" 
 
+
+int snap_inodes = 0;
+long snap_kmemory = 0;
+int snap_stack = 0;
 struct snap_control_device snap_dev;
 
 extern int snap_ioctl (struct inode * inode, struct file * filp, 
@@ -64,14 +44,12 @@ static int snap_psdev_open(struct inode * inode, struct file * file)
         ENTRY;
 
        if (!inode)
-               return -EINVAL;
+               RETURN(-EINVAL);
        dev = MINOR(inode->i_rdev);
        if (dev != SNAP_PSDEV_MINOR)
-               return -ENODEV;
+               RETURN(-ENODEV);
 
-        MOD_INC_USE_COUNT;
-        EXIT;
-        return 0;
+        RETURN(0);
 }
 
 /* called when closing /dev/device */
@@ -81,15 +59,12 @@ static int snap_psdev_release(struct inode * inode, struct file * file)
         ENTRY;
 
        if (!inode)
-               return -EINVAL;
+               RETURN(-EINVAL);
        dev = MINOR(inode->i_rdev);
        if (dev != SNAP_PSDEV_MINOR)
-               return -ENODEV;
-
-        MOD_DEC_USE_COUNT;
+               RETURN(-ENODEV);
 
-        EXIT;
-        return 0;
+        RETURN(0);
 }
 
 /* XXX need ioctls here to do snap_delete and snap_restore, snap_backup */
@@ -97,19 +72,9 @@ static int snap_psdev_release(struct inode * inode, struct file * file)
 
 /* declare character device */
 static struct file_operations snapcontrol_fops = {
-       NULL,                  /* llseek */
-       NULL,                  /* read */
-       NULL,                  /* write */
-       NULL,                  /* presto_psdev_readdir */
-        NULL,                  /* poll */
-       snap_ioctl,            /* ioctl */
-       NULL,                  /* presto_psdev_mmap */
-       snap_psdev_open,       /* open */
-       NULL,
-       snap_psdev_release,    /* release */
-       NULL,                  /* fsync */
-       NULL,                  /* fasync */
-       NULL                   /* lock */
+       ioctl:          snap_ioctl,            /* ioctl */
+       open:           snap_psdev_open,       /* open */
+       release:        snap_psdev_release,    /* release */
 };
 
 
@@ -117,14 +82,14 @@ static struct file_operations snapcontrol_fops = {
 #define SNAPFS_MINOR 240
 
 static struct miscdevice snapcontrol_dev = {
-       SNAPFS_MINOR,
-       "snapcontrol",
-       &snapcontrol_fops
+       minor:  SNAPFS_MINOR,
+       name:   "snapcontrol",
+       fops:   &snapcontrol_fops
 };
 
 int init_snap_psdev(void)
 {
-       printk(KERN_INFO "SNAP psdev driver  v0.01, braam@mountainviewdata.com\n");
+       printk(KERN_INFO "SNAP psdev driver  v0.01, braam@clusterfs.com\n");
        
        misc_register( &snapcontrol_dev );
 
@@ -138,7 +103,6 @@ void snap_cleanup_psdev(void)
        EXIT;
 }
 
-#ifdef MODULE
 MODULE_AUTHOR("Peter J. Braam <braam@cs.cmu.edu>");
 MODULE_DESCRIPTION("Snapfs file system filters v0.01");
 
@@ -147,7 +111,7 @@ extern int cleanup_snapfs(void);
 extern int init_clonefs(void);
 extern int init_snap_sysctl(void); 
 
-int init_module(void)
+static int __init snapfs_init(void)
 {
        int err;
        if ( (err = init_snap_psdev()) ) {
@@ -164,17 +128,18 @@ int init_module(void)
                printk("Error initializing snapfs proc sys, %d\n", err);
                return -EINVAL;
        }
-
-
+       
        return 0;
 }
 
-void cleanup_module(void)
+static void __exit snapfs_cleanup(void)
 {
 
        cleanup_snapfs();
        snap_cleanup_psdev();
        
 }
-#endif
+module_init(snapfs_init);
+module_exit(snapfs_cleanup);
+