Whamcloud - gitweb
class_obd.c: plugged a few minor memory leaks
[fs/lustre-release.git] / lustre / obdclass / genops.c
index 5c75ca5..c4f1533 100644 (file)
@@ -6,22 +6,72 @@
  *
  */
 
-#include <asm/uaccess.h>
-#include <linux/sched.h>
-#include <linux/stat.h>
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
 #include <linux/string.h>
+#include <linux/stat.h>
+#include <linux/errno.h>
 #include <linux/locks.h>
-#include <linux/quotaops.h>
-#include <linux/list.h>
-#include <linux/file.h>
-#include <linux/iobuf.h>
-#include <asm/bitops.h>
-#include <asm/byteorder.h>
+#include <linux/unistd.h>
+
+#include <asm/system.h>
+#include <asm/uaccess.h>
+
+#include <linux/fs.h>
+#include <linux/stat.h>
+#include <asm/uaccess.h>
+#include <linux/vmalloc.h>
+#include <asm/segment.h>
+#include <linux/mm.h>
+#include <linux/pagemap.h>
+#include <linux/smp_lock.h>
+
 #include <linux/obd_support.h>
 #include <linux/obd_class.h>
 
 
 extern struct obd_device obd_dev[MAX_OBD_DEVICES];
+kmem_cache_t *obdo_cachep = NULL;
+
+int obd_init_obdo_cache(void)
+{
+       ENTRY;
+       if (obdo_cachep == NULL) {
+               CDEBUG(D_CACHE, "allocating obdo_cache\n");
+               obdo_cachep = kmem_cache_create("obdo_cache",
+                                               sizeof(struct obdo),
+                                               0, SLAB_HWCACHE_ALIGN,
+                                               NULL, NULL);
+               if (obdo_cachep == NULL) {
+                       EXIT;
+                       return -ENOMEM;
+               } else {
+                       CDEBUG(D_CACHE, "allocated cache at %p\n", obdo_cachep);
+               }
+       } else {
+               CDEBUG(D_CACHE, "using existing cache at %p\n", obdo_cachep);
+       }
+       EXIT;
+       return 0;
+}
+
+void obd_cleanup_obdo_cache(void)
+{
+       ENTRY;
+       if (obdo_cachep != NULL) {
+               CDEBUG(D_CACHE, "destroying obdo_cache at %p\n", obdo_cachep);
+               if (kmem_cache_destroy(obdo_cachep))
+                       printk(KERN_WARNING __FUNCTION__
+                              ": unable to free cache\n");
+       } else
+               printk(KERN_INFO __FUNCTION__
+                      ": called with NULL cache pointer\n");
+
+       obdo_cachep = NULL;
+       EXIT;
+}
+
 
 /* map connection to client */
 struct obd_client *gen_client(struct obd_conn *conn)
@@ -42,7 +92,6 @@ struct obd_client *gen_client(struct obd_conn *conn)
 } /* obd_client */
 
 
-
 /* a connection defines a context in which preallocation can be managed. */ 
 int gen_connect (struct obd_conn *conn)
 {
@@ -50,19 +99,19 @@ int gen_connect (struct obd_conn *conn)
 
        OBD_ALLOC(cli, struct obd_client *, sizeof(struct obd_client));
        if ( !cli ) {
-               printk("obd_connect (minor %d): no memory!\n", 
+               printk(__FUNCTION__ ": no memory! (minor %d)\n", 
                       conn->oc_dev->obd_minor);
                return -ENOMEM;
        }
 
        INIT_LIST_HEAD(&cli->cli_prealloc_inodes);
-       /* this should probably spinlocked? */
+       /* XXX this should probably spinlocked? */
        cli->cli_id = ++conn->oc_dev->obd_gen_last_id;
        cli->cli_prealloc_quota = 0;
        cli->cli_obd = conn->oc_dev;
        list_add(&(cli->cli_chain), conn->oc_dev->obd_gen_clients.prev);
 
-       CDEBUG(D_IOCTL, "connect: new ID %u\n", cli->cli_id);
+       CDEBUG(D_INFO, "connect: new ID %u\n", cli->cli_id);
        conn->oc_id = cli->cli_id;
        return 0;
 } /* gen_obd_connect */
@@ -83,7 +132,7 @@ int gen_disconnect(struct obd_conn *conn)
        list_del(&(cli->cli_chain));
        OBD_FREE(cli, sizeof(struct obd_client));
 
-       CDEBUG(D_IOCTL, "disconnect: ID %u\n", conn->oc_id);
+       CDEBUG(D_INFO, "disconnect: ID %u\n", conn->oc_id);
 
        EXIT;
        return 0;
@@ -95,7 +144,7 @@ int gen_disconnect(struct obd_conn *conn)
  *   used to make calls to these devices.
  *   data holds nothing
  */ 
-int gen_multi_setup(struct obd_device *obddev, int len, void *data)
+int gen_multi_setup(struct obd_device *obddev, uint32_t len, void *data)
 {
        int i;
 
@@ -105,7 +154,12 @@ int gen_multi_setup(struct obd_device *obddev, int len, void *data)
                rc  = OBP(ch_conn->oc_dev, connect)(ch_conn);
 
                if ( rc != 0 ) {
-                       /* XXX disconnect others */
+                       int j;
+
+                       for (j = --i; j >= 0; --j) {
+                               ch_conn = &obddev->obd_multi_conn[i];
+                               OBP(ch_conn->oc_dev, disconnect)(ch_conn);
+                       }
                        return -EINVAL;
                }
        }               
@@ -125,7 +179,7 @@ int gen_multi_attach(struct obd_device *obddev, int len, void *data)
        for (i=0 ; i<count ; i++) {
                rdev = &obd_dev[*((int *)data + i)];
                rdev = rdev + 1;
-               CDEBUG(D_IOCTL, "OBD RAID1: replicator %d is of type %s\n", i,
+               CDEBUG(D_INFO, "OBD RAID1: replicator %d is of type %s\n", i,
                       (rdev + i)->obd_type->typ_name);
        }
        return 0;
@@ -148,7 +202,9 @@ int gen_multi_cleanup(struct obd_device *obddev)
                rc  = OBP(ch_conn->oc_dev, disconnect)(ch_conn);
 
                if ( rc != 0 ) {
-                       printk("OBD multi cleanup dev: disconnect failure %d\n", ch_conn->oc_dev->obd_minor);
+                       printk(KERN_WARNING __FUNCTION__
+                              ": disconnect failure %d\n",
+                              ch_conn->oc_dev->obd_minor);
                }
        }               
        return 0;
@@ -170,7 +226,7 @@ int gen_cleanup(struct obd_device * obddev)
        lh = tmp = &obddev->obd_gen_clients;
        while ((tmp = tmp->next) != lh) {
                cli = list_entry(tmp, struct obd_client, cli_chain);
-               CDEBUG(D_IOCTL, "Disconnecting obd_connection %d, at %p\n",
+               CDEBUG(D_INFO, "Disconnecting obd_connection %d, at %p\n",
                       cli->cli_id, cli);
        }
        return 0;
@@ -199,37 +255,70 @@ void lck_page(struct page *page)
                 ___wait_on_page(page);
 }
 
-int gen_copy_data(struct obd_conn *conn, obdattr *src, obdattr *tgt)
+int gen_copy_data(struct obd_conn *dst_conn, struct obdo *dst,
+                 struct obd_conn *src_conn, struct obdo *src,
+                 obd_size count, obd_off offset)
 {
        struct page *page;
        unsigned long index = 0;
-       int rc;
+       int err = 0;
 
+       ENTRY;
+       CDEBUG(D_INFO, "src: ino %Ld blocks %Ld, size %Ld, dst: ino %Ld\n", 
+              src->o_id, src->o_blocks, src->o_size, dst->o_id);
        page = alloc_page(GFP_USER);
-       if ( !page ) 
+       if ( !page ) {
+               EXIT;
                return -ENOMEM;
-
+       }
        
        lck_page(page);
        
-       while (index < src->i_size / PAGE_SIZE) {
+       /* XXX with brw vector I/O, we could batch up reads and writes here,
+        *     all we need to do is allocate multiple pages to handle the I/Os
+        *     and arrays to handle the request parameters.
+        */
+       while (index < ((src->o_size + PAGE_SIZE - 1) >> PAGE_SHIFT)) {
+               obd_count        num_oa = 1;
+               obd_count        num_buf = 1;
+               char            *buf;
+               obd_size         brw_count = PAGE_SIZE;
+               obd_off          brw_offset = (page->index) << PAGE_SHIFT;
+               obd_flag         flagr = 0;
+               obd_flag         flagw = OBD_BRW_CREATE;
                
                page->index = index;
-               rc = OBP(conn->oc_dev, brw)(READ, conn, src, page, 0);
+               buf = (char *)page_address(page); 
+               err = OBP(src_conn->oc_dev, brw)(READ, src_conn, num_oa, &src,
+                                                &num_buf, &buf, &brw_count,
+                                                &brw_offset, &flagr);
 
-               if ( rc != PAGE_SIZE ) 
+               if ( err ) {
+                       EXIT;
                        break;
+               }
+               CDEBUG(D_INFO, "Read page %ld ...\n", page->index);
+
+               err = OBP(dst_conn->oc_dev, brw)(WRITE, dst_conn, num_oa, &dst,
+                                                &num_buf, &buf, &brw_count,
+                                                &brw_offset, &flagw);
 
-               rc = OBP(conn->oc_dev,brw)(WRITE, conn, tgt, page, 1);
-               if ( rc != PAGE_SIZE)
+               /* XXX should handle dst->o_size, dst->o_blocks here */
+               if ( err ) {
+                       EXIT;
                        break;
+               }
+
+               CDEBUG(D_INFO, "Wrote page %ld ...\n", page->index);
                
-               index ++;
+               index++;
        }
-       tgt->i_size = src->i_size;
-       tgt->i_blocks = src->i_blocks;
+       dst->o_size = src->o_size;
+       dst->o_blocks = src->o_blocks;
+       dst->o_valid |= (OBD_MD_FLSIZE | OBD_MD_FLBLOCKS);
        UnlockPage(page);
        __free_page(page);
 
-       return 0;
+       EXIT;
+       return err;
 }