Changeset 520 for packages/main

Timestamp:

24/06/2008 10:18:55 (2 months ago)

Author:

nextime

Message:

--

Files:

• packages/main/cloop/tags/venus/compressed_loop.c (modified) (25 diffs)
• packages/main/cloop/tags/venus/debian/changelog (modified) (1 diff)
• packages/main/cloop/trunk/compressed_loop.c (modified) (25 diffs)
• packages/main/cloop/trunk/debian/changelog (modified) (1 diff)

packages/main/cloop/tags/venus/compressed_loop.c

@@ -21 +21 @@
-
-#define CLOOP_NAME "cloop"
-4
+5
-#define CLOOP_MAX 8
-
@@ -125 +125 @@
- void *buffer[BUFFERED_BLOCKS];
- void *compressed_buffer;
+ size_t preload_size;
- void *preload_cache;
-
@@ -132 +133 @@
- struct inode  *backing_inode; /* for bmap */
-
+ unsigned long largest_block;
- unsigned int underlying_blksize;
- int clo_number;
@@ -157 +159 @@
-#endif
-
+/* Use __get_free_pages instead of vmalloc, allows up to 32 pages,
+ * 2MB in one piece */
+static void *cloop_malloc(size_t size)
+{
+ return (void *)__get_free_pages(GFP_KERNEL, get_order(size));
+}
+
+static void cloop_free(void *mem, size_t size)
+{
+ free_pages((unsigned long)mem, get_order(size));
+}
+
-static int uncompress(struct cloop_device *clo,
-                      unsigned char *dest, unsigned long *destLen,
@@ -179 +193 @@
-}
-
-/* This is more complicated than it looks. */
-struct cloop_read_data
-{
- struct cloop_device *clo;
- char *data; /* We need to keep track of where we are in the buffer */
- int bsize;
-};
-
-/* We need this for do_generic_file_read() because the default function */
-/* wants to read into user-space for an unknown reason. :-/ See loop.c. */
-static int cloop_read_actor(read_descriptor_t * desc, struct page *page,
-                          unsigned long offset, unsigned long size)
-{
- unsigned long count = desc->count;
- struct cloop_read_data *p = (struct cloop_read_data*)desc->arg.data;
- char *kaddr_page;
- if (size > count) size = count;
- kaddr_page = kmap(page);
- memcpy(p->data, kaddr_page + offset, size);
- kunmap(page);
- desc->count = count - size;
- desc->written += size;
- p->data += size;
- return size;
-}
-
-static size_t cloop_read_from_file(struct cloop_device *clo, struct file *f, char *buf,
-  loff_t pos, size_t buf_len)
@@ -212 +200 @@
-  {
-   size_t size = buf_len - buf_done;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-     if(left<0) left = 0; /* better safe than sorry */
-     printk(KERN_ERR "%s: Read error at pos %Lu in file %s, "
@@ -235 +210 @@
-     break;
-    }
-desc.written
+size_read
-  }
- return buf_done;
-}
-
-
-/* This looks more complicated than it is */
@@ -301 +275 @@
- int buffered_blocknum = -1;
- int preloaded = 0;
- struct bio *bio;
- loff_t offset     = (loff_t) req->sector<<9;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)  /* New kernel */
@@ -352 +325 @@
-  } /* end rq_for_each_segment*/
-#else /* Old Kernel */
+ struct bio *bio;
- rq_for_each_bio(bio, req)
-  {
@@ -426 +400 @@
-    {
-     int uptodate;
+     unsigned long flags;
-     struct request *req;
+     spin_lock_irqsave(&clo->queue_lock, flags);
-     req = list_entry(p, struct request, queuelist);
-     spin_lock_irq(&clo->queue_lock);
-     list_del_init(&req->queuelist);
-
-
+
-     uptodate = cloop_handle_request(clo, req);
-
-
+
+
+
+
-     if(!end_that_request_first(req, uptodate, req->nr_sectors))
-       end_that_request_last(req, uptodate);
-
+
+
-    }
+#if 0
-   spin_lock_irq(&clo->queue_lock);
-   blk_start_queue(clo->clo_queue);
-   spin_unlock_irq(&clo->queue_lock);
+#endif
-  }
- DEBUGP(KERN_ERR "cloop_thread exited.\n");
@@ -476 +455 @@
-    }
-   blkdev_dequeue_request(req); /* Dequeue request first. */
+#if 0
-   blk_stop_queue(q);           /* Stop queue processing */
+#endif
-   list_add(&req->queuelist, &clo->clo_list); /* Add to working list for thread */
-   count++;
@@ -484 +465 @@
-   DEBUGP(KERN_ERR "cloop_do_request: Discarding request %p.\n", req);
-   req->errors++;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)  /* New kernel */
+   __blk_end_request(req, -EIO, req->nr_sectors << 9);
+#else
-   end_request(req, 0); /* Discard */
+#endif
-  }
-}
@@ -495 +480 @@
- char *bbuf=NULL;
- unsigned int i, offsets_read, total_offsets;
- unsigned long largest_block=0;
- int isblkdev;
- int error = 0;
@@ -532 +516 @@
-   clo->underlying_blksize = PAGE_SIZE;
- DEBUGP("Underlying blocksize is %u\n", clo->underlying_blksize);
-v
+cloop_
- if(!bbuf)
-  {
@@ -581 +565 @@
-       error=-EBADF; goto error_release;
-      }
-v
+cloop_
-     if (!clo->offsets)
-      {
@@ -599 +583 @@
-    {
-     loff_t d=be64_to_cpu(clo->offsets[i+1]) - be64_to_cpu(clo->offsets[i]);
-largest_block=MAX(
+clo->largest_block=MAX(clo->
-    }
-   printk(KERN_INFO "%s: %s: %u blocks, %u bytes/block, largest block is %lu bytes.\n",
-          cloop_name, filename, ntohl(clo->head.num_blocks),
-
+clo->
-  }
-/* Combo kmalloc used too large chunks (>130000). */
@@ -610 +594 @@
-  for(i=0;i<BUFFERED_BLOCKS;i++)
-   {
-v
+cloop_
-    if(!clo->buffer[i])
-     {
@@ -619 +603 @@
-   }
- }
-vmalloc(
+cloop_malloc(clo->
- if(!clo->compressed_buffer)
-  {
-   printk(KERN_ERR "%s: out of memory for compressed buffer %lu\n",
-
+clo->
-   error=-ENOMEM; goto error_release_free_buffer;
-  }
-v
+cloop_
- if(!clo->zstream.workspace)
-  {
@@ -641 +625 @@
-          be64_to_cpu(clo->offsets[ntohl(clo->head.num_blocks)]),
-          inode->i_size);
-vfree(clo->zstream.workspace
+cloop_free(clo->zstream.workspace, zlib_inflate_workspacesize()
-   goto error_release_free_all;
-  }
@@ -660 +644 @@
- if(preload > 0)
-  {
-size_t 
+clo->
-                          * ntohl(clo->head.block_size);
-vmalloc(
+cloop_malloc(clo->
-    {
-     int i;
@@ -675 +659 @@
-        {
-         printk(KERN_WARNING "%s: can't read block %d into preload cache, ignored.\n", cloop_name, i);
-vfree(clo->preload_cach
+cloop_free(clo->preload_cache, clo->preload_siz
-         clo->preload_cache = NULL;
-         break;
@@ -687 +671 @@
- return error;
-error_release_free_all:
-vfree(clo->compressed_buffer
+cloop_free(clo->compressed_buffer, clo->largest_block
- clo->compressed_buffer=NULL;
-error_release_free_buffer:
@@ -696 +680 @@
-    if(clo->buffer[i])
-     {
-vfree(clo->buffer[i]
+cloop_free(clo->buffer[i], ntohl(clo->head.block_size)
-      clo->buffer[i]=NULL;
-     }
@@ -702 +686 @@
- }
-error_release_free:
-vfree(clo->
+cloop_free(clo->offsets, sizeof(loff_t) * total_
- clo->offsets=NULL;
-error_release:
-vfree(bbuf
+cloop_free(bbuf, clo->underlying_blksize
- clo->backing_file=NULL;
- return error;
@@ -741 +725 @@
- clo->backing_file  = NULL;
- clo->backing_inode = NULL;
-vfree(clo->offsets
-vfree(clo->preload_cach
+cloop_free(clo->offsets, clo->underlying_blksize
+cloop_free(clo->preload_cache, clo->preload_siz
- for(i=0; i<BUFFERED_BLOCKS; i++)
-vfree(clo->buffer[i]
-vfree(clo->compressed_buffer
+cloop_free(clo->buffer[i], ntohl(clo->head.block_size)
+cloop_free(clo->compressed_buffer, clo->largest_block
- zlib_inflateEnd(&clo->zstream);
-vfree(clo->zstream.workspace
+cloop_free(clo->zstream.workspace, zlib_inflate_workspacesize()
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
- if(bdev) invalidate_bdev(bdev, 0);

packages/main/cloop/tags/venus/debian/changelog

@@ +1 @@
+cloop (2.625.venus-1) stable; urgency=low
+
+  * Fix build issue with kernel 2.6.25
+
+ -- Unixmedia S.r.l. (Medianix Devel) <devel@unixmedia.it>  Tue, 24 Jun 2008 10:18:31 +0200
+
-cloop (2.624.venus-1) stable; urgency=low
-

packages/main/cloop/trunk/compressed_loop.c

@@ -21 +21 @@
-
-#define CLOOP_NAME "cloop"
-4
+5
-#define CLOOP_MAX 8
-
@@ -125 +125 @@
- void *buffer[BUFFERED_BLOCKS];
- void *compressed_buffer;
+ size_t preload_size;
- void *preload_cache;
-
@@ -132 +133 @@
- struct inode  *backing_inode; /* for bmap */
-
+ unsigned long largest_block;
- unsigned int underlying_blksize;
- int clo_number;
@@ -157 +159 @@
-#endif
-
+/* Use __get_free_pages instead of vmalloc, allows up to 32 pages,
+ * 2MB in one piece */
+static void *cloop_malloc(size_t size)
+{
+ return (void *)__get_free_pages(GFP_KERNEL, get_order(size));
+}
+
+static void cloop_free(void *mem, size_t size)
+{
+ free_pages((unsigned long)mem, get_order(size));
+}
+
-static int uncompress(struct cloop_device *clo,
-                      unsigned char *dest, unsigned long *destLen,
@@ -179 +193 @@
-}
-
-/* This is more complicated than it looks. */
-struct cloop_read_data
-{
- struct cloop_device *clo;
- char *data; /* We need to keep track of where we are in the buffer */
- int bsize;
-};
-
-/* We need this for do_generic_file_read() because the default function */
-/* wants to read into user-space for an unknown reason. :-/ See loop.c. */
-static int cloop_read_actor(read_descriptor_t * desc, struct page *page,
-                          unsigned long offset, unsigned long size)
-{
- unsigned long count = desc->count;
- struct cloop_read_data *p = (struct cloop_read_data*)desc->arg.data;
- char *kaddr_page;
- if (size > count) size = count;
- kaddr_page = kmap(page);
- memcpy(p->data, kaddr_page + offset, size);
- kunmap(page);
- desc->count = count - size;
- desc->written += size;
- p->data += size;
- return size;
-}
-
-static size_t cloop_read_from_file(struct cloop_device *clo, struct file *f, char *buf,
-  loff_t pos, size_t buf_len)
@@ -212 +200 @@
-  {
-   size_t size = buf_len - buf_done;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-     if(left<0) left = 0; /* better safe than sorry */
-     printk(KERN_ERR "%s: Read error at pos %Lu in file %s, "
@@ -235 +210 @@
-     break;
-    }
-desc.written
+size_read
-  }
- return buf_done;
-}
-
-
-/* This looks more complicated than it is */
@@ -301 +275 @@
- int buffered_blocknum = -1;
- int preloaded = 0;
- struct bio *bio;
- loff_t offset     = (loff_t) req->sector<<9;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)  /* New kernel */
@@ -352 +325 @@
-  } /* end rq_for_each_segment*/
-#else /* Old Kernel */
+ struct bio *bio;
- rq_for_each_bio(bio, req)
-  {
@@ -426 +400 @@
-    {
-     int uptodate;
+     unsigned long flags;
-     struct request *req;
+     spin_lock_irqsave(&clo->queue_lock, flags);
-     req = list_entry(p, struct request, queuelist);
-     spin_lock_irq(&clo->queue_lock);
-     list_del_init(&req->queuelist);
-
-
+
-     uptodate = cloop_handle_request(clo, req);
-
-
+
+
+
+
-     if(!end_that_request_first(req, uptodate, req->nr_sectors))
-       end_that_request_last(req, uptodate);
-
+
+
-    }
+#if 0
-   spin_lock_irq(&clo->queue_lock);
-   blk_start_queue(clo->clo_queue);
-   spin_unlock_irq(&clo->queue_lock);
+#endif
-  }
- DEBUGP(KERN_ERR "cloop_thread exited.\n");
@@ -476 +455 @@
-    }
-   blkdev_dequeue_request(req); /* Dequeue request first. */
+#if 0
-   blk_stop_queue(q);           /* Stop queue processing */
+#endif
-   list_add(&req->queuelist, &clo->clo_list); /* Add to working list for thread */
-   count++;
@@ -484 +465 @@
-   DEBUGP(KERN_ERR "cloop_do_request: Discarding request %p.\n", req);
-   req->errors++;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)  /* New kernel */
+   __blk_end_request(req, -EIO, req->nr_sectors << 9);
+#else
-   end_request(req, 0); /* Discard */
+#endif
-  }
-}
@@ -495 +480 @@
- char *bbuf=NULL;
- unsigned int i, offsets_read, total_offsets;
- unsigned long largest_block=0;
- int isblkdev;
- int error = 0;
@@ -532 +516 @@
-   clo->underlying_blksize = PAGE_SIZE;
- DEBUGP("Underlying blocksize is %u\n", clo->underlying_blksize);
-v
+cloop_
- if(!bbuf)
-  {
@@ -581 +565 @@
-       error=-EBADF; goto error_release;
-      }
-v
+cloop_
-     if (!clo->offsets)
-      {
@@ -599 +583 @@
-    {
-     loff_t d=be64_to_cpu(clo->offsets[i+1]) - be64_to_cpu(clo->offsets[i]);
-largest_block=MAX(
+clo->largest_block=MAX(clo->
-    }
-   printk(KERN_INFO "%s: %s: %u blocks, %u bytes/block, largest block is %lu bytes.\n",
-          cloop_name, filename, ntohl(clo->head.num_blocks),
-
+clo->
-  }
-/* Combo kmalloc used too large chunks (>130000). */
@@ -610 +594 @@
-  for(i=0;i<BUFFERED_BLOCKS;i++)
-   {
-v
+cloop_
-    if(!clo->buffer[i])
-     {
@@ -619 +603 @@
-   }
- }
-vmalloc(
+cloop_malloc(clo->
- if(!clo->compressed_buffer)
-  {
-   printk(KERN_ERR "%s: out of memory for compressed buffer %lu\n",
-
+clo->
-   error=-ENOMEM; goto error_release_free_buffer;
-  }
-v
+cloop_
- if(!clo->zstream.workspace)
-  {
@@ -641 +625 @@
-          be64_to_cpu(clo->offsets[ntohl(clo->head.num_blocks)]),
-          inode->i_size);
-vfree(clo->zstream.workspace
+cloop_free(clo->zstream.workspace, zlib_inflate_workspacesize()
-   goto error_release_free_all;
-  }
@@ -660 +644 @@
- if(preload > 0)
-  {
-size_t 
+clo->
-                          * ntohl(clo->head.block_size);
-vmalloc(
+cloop_malloc(clo->
-    {
-     int i;
@@ -675 +659 @@
-        {
-         printk(KERN_WARNING "%s: can't read block %d into preload cache, ignored.\n", cloop_name, i);
-vfree(clo->preload_cach
+cloop_free(clo->preload_cache, clo->preload_siz
-         clo->preload_cache = NULL;
-         break;
@@ -687 +671 @@
- return error;
-error_release_free_all:
-vfree(clo->compressed_buffer
+cloop_free(clo->compressed_buffer, clo->largest_block
- clo->compressed_buffer=NULL;
-error_release_free_buffer:
@@ -696 +680 @@
-    if(clo->buffer[i])
-     {
-vfree(clo->buffer[i]
+cloop_free(clo->buffer[i], ntohl(clo->head.block_size)
-      clo->buffer[i]=NULL;
-     }
@@ -702 +686 @@
- }
-error_release_free:
-vfree(clo->
+cloop_free(clo->offsets, sizeof(loff_t) * total_
- clo->offsets=NULL;
-error_release:
-vfree(bbuf
+cloop_free(bbuf, clo->underlying_blksize
- clo->backing_file=NULL;
- return error;
@@ -741 +725 @@
- clo->backing_file  = NULL;
- clo->backing_inode = NULL;
-vfree(clo->offsets
-vfree(clo->preload_cach
+cloop_free(clo->offsets, clo->underlying_blksize
+cloop_free(clo->preload_cache, clo->preload_siz
- for(i=0; i<BUFFERED_BLOCKS; i++)
-vfree(clo->buffer[i]
-vfree(clo->compressed_buffer
+cloop_free(clo->buffer[i], ntohl(clo->head.block_size)
+cloop_free(clo->compressed_buffer, clo->largest_block
- zlib_inflateEnd(&clo->zstream);
-vfree(clo->zstream.workspace
+cloop_free(clo->zstream.workspace, zlib_inflate_workspacesize()
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
- if(bdev) invalidate_bdev(bdev, 0);

packages/main/cloop/trunk/debian/changelog

@@ +1 @@
+cloop (2.625) unstable; urgency=low
+
+  * Fix compiling issue for kernel 2.6.25 
+
+ -- Unixmedia S.r.l. (Medianix Devel) <devel@unixmedia.it>  Tue, 24 Jun 2008 10:16:56 +0200
+
-cloop (2.624) unstable; urgency=low
-