Changeset 2c6cc3c in rtems

Timestamp:

05/30/12 11:22:08 (11 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

73c09b3b

Parents:

40284de

git-author:

Sebastian Huber <sebastian.huber@…> (05/30/12 11:22:08)

git-committer:

Sebastian Huber <sebastian.huber@…> (05/31/12 09:05:48)

Message:

libblock: Remove explicit bds_per_group parameter

File:

• cpukit/libblock/src/bdbuf.c (modified) (14 diffs)

cpukit/libblock/src/bdbuf.c

@@ -1237 +1237 @@
 static rtems_bdbuf_buffer *
 rtems_bdbuf_get_buffer_from_lru_list (const rtems_disk_device *dd,
-                                      rtems_blkdev_bnum block,
-                                      size_t            bds_per_group)
+                                      rtems_blkdev_bnum block)
 {
   rtems_chain_node *node = rtems_chain_first (&bdbuf_cache.lru);
@@ -1251 +1250 @@
               bd - bdbuf_cache.bds,
               bd->group - bdbuf_cache.groups, bd->group->users,
-              bd->group->bds_per_group, bds_per_group);
+              bd->group->bds_per_group, dd->bds_per_group);
 
     /*
@@ -1258 +1257 @@
     if (bd->waiters == 0)
     {
-      if (bd->group->bds_per_group == bds_per_group)
+      if (bd->group->bds_per_group == dd->bds_per_group)
       {
         rtems_bdbuf_remove_from_tree_and_lru_list (bd);
@@ -1265 +1264 @@
       }
       else if (bd->group->users == 0)
-        empty_bd = rtems_bdbuf_group_realloc (bd->group, bds_per_group);
+        empty_bd = rtems_bdbuf_group_realloc (bd->group, dd->bds_per_group);
     }
 
@@ -1689 +1688 @@
 static rtems_bdbuf_buffer *
 rtems_bdbuf_get_buffer_for_read_ahead (const rtems_disk_device *dd,
-                                       rtems_blkdev_bnum block,
-                                       size_t            bds_per_group)
+                                       rtems_blkdev_bnum block)
 {
   rtems_bdbuf_buffer *bd = NULL;
@@ -1698 +1696 @@
   if (bd == NULL)
   {
-    bd = rtems_bdbuf_get_buffer_from_lru_list (dd, block, bds_per_group);
+    bd = rtems_bdbuf_get_buffer_from_lru_list (dd, block);
 
     if (bd != NULL)
@@ -1715 +1713 @@
 static rtems_bdbuf_buffer *
 rtems_bdbuf_get_buffer_for_access (const rtems_disk_device *dd,
-                                   rtems_blkdev_bnum block,
-                                   size_t            bds_per_group)
+                                   rtems_blkdev_bnum block)
 {
   rtems_bdbuf_buffer *bd = NULL;
@@ -1726 +1723 @@
     if (bd != NULL)
     {
-      if (bd->group->bds_per_group != bds_per_group)
+      if (bd->group->bds_per_group != dd->bds_per_group)
       {
         if (rtems_bdbuf_wait_for_recycle (bd))
@@ -1739 +1736 @@
     else
     {
-      bd = rtems_bdbuf_get_buffer_from_lru_list (dd, block, bds_per_group);
+      bd = rtems_bdbuf_get_buffer_from_lru_list (dd, block);
 
       if (bd == NULL)
@@ -1796 +1793 @@
             media_block, block, (unsigned) dd->dev);
 
-  bd = rtems_bdbuf_get_buffer_for_access (dd, media_block, dd->bds_per_group);
+  bd = rtems_bdbuf_get_buffer_for_access (dd, media_block);
 
   switch (bd->state)
@@ -1856 +1853 @@
 rtems_bdbuf_create_read_request (const rtems_disk_device *dd,
                                  rtems_blkdev_bnum        media_block,
-                                 size_t                   bds_per_group,
                                  rtems_blkdev_request    *req,
                                  rtems_bdbuf_buffer     **bd_ptr)
@@ -1879 +1875 @@
   req->bufnum = 0;
 
-  bd = rtems_bdbuf_get_buffer_for_access (dd, media_block, bds_per_group);
+  bd = rtems_bdbuf_get_buffer_for_access (dd, media_block);
 
   *bd_ptr = bd;
@@ -1908 +1904 @@
     media_block += media_block_count;
 
-    bd = rtems_bdbuf_get_buffer_for_read_ahead (dd, media_block,
-                                                bds_per_group);
+    bd = rtems_bdbuf_get_buffer_for_read_ahead (dd, media_block);
 
     if (bd == NULL)
@@ -2020 +2015 @@
 
   rtems_bdbuf_lock_cache ();
-  rtems_bdbuf_create_read_request (dd, media_block, dd->bds_per_group, req, &bd);
+  rtems_bdbuf_create_read_request (dd, media_block, req, &bd);
 
   if (req->bufnum > 0)