Add xbinheap xtype implementation

[archipelago] / xseg / sys / kernel / segdev.c

diff --git a/xseg/sys/kernel/segdev.c b/xseg/sys/kernel/segdev.c
index 022372e..c438dee 100644 (file)
--- a/xseg/sys/kernel/segdev.c
+++ b/xseg/sys/kernel/segdev.c
@@ -1,4 +1,38 @@
 /*
+ * Copyright 2012 GRNET S.A. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer.
+ *   2. Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer in the documentation and/or other materials
+ *      provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and
+ * documentation are those of the authors and should not be
+ * interpreted as representing official policies, either expressed
+ * or implied, of GRNET S.A.
+ */
+
+/*
  *
  */
 
@@ -115,7 +149,7 @@ out:
        return dev;
 
 fail_busy:
-       atomic_dec(&dev->usercount);
+       segdev_put(dev);
        dev = ERR_PTR(-EBUSY);
        goto out;
 }
@@ -214,23 +248,20 @@ static ssize_t segdev_write(struct file *file, const char __user *buf,
 {
        struct segdev_file *vf = file->private_data;
        struct segdev *dev = segdev_get(vf->minor);
-       char buffer[SEGDEV_BUFSIZE];
        uint32_t portno;
        int ret = -ENODEV;
        if (!dev)
                goto out;
 
-       if (count > SEGDEV_BUFSIZE)
-               count = SEGDEV_BUFSIZE;
+       if (count != sizeof(uint32_t))
+               goto out_put;
 
-       ret = copy_from_user(buffer, buf, count);
+       ret = copy_from_user(&portno, buf, sizeof(uint32_t));
        if (ret < 0)
-               goto out;
+               goto out_put;
 
        if((count - ret) != sizeof(uint32_t))
-               goto out;
-
-       portno = *(uint32_t *)buffer;
+               goto out_put;
 
        ret = 0;
        if (dev->callback)
@@ -239,6 +270,7 @@ static ssize_t segdev_write(struct file *file, const char __user *buf,
                ret = -ENOSYS;
 
        dev->buffer_index = 0;
+out_put:
        segdev_put(dev);
 out:
        return ret;
@@ -353,5 +385,5 @@ module_exit(segdev_mod_exit);
 
 MODULE_DESCRIPTION("segdev");
 MODULE_AUTHOR("XSEG");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("BSD");