Index: cpukit/libblock/src/bdbuf.c
===================================================================
--- cpukit/libblock/src/bdbuf.c	(revision 4670d91898a0571866cca239b39d20281f3f88c6)
+++ cpukit/libblock/src/bdbuf.c	(revision 7baa484300d36a9ced34f6642501f91fd1428461)
@@ -1937,5 +1937,5 @@
  * there are buffers to be written. If the transfer fails place the buffers
  * back on the modified list and try again later. The pool is unlocked while
- * the buffers are beign written to disk.
+ * the buffers are being written to disk.
  *
  * @param pid The pool id to process modified buffers on.
@@ -1966,6 +1966,6 @@
   /*
    * When the sync is for a device limit the sync to that device. If the sync
-   * is for a buffer handle the devices in the order on the sync list. This
-   * means the dev is -1.
+   * is for a buffer handle process the devices in the order on the sync
+   * list. This means the dev is -1.
    */
   if (pool->sync_active)
@@ -1973,5 +1973,5 @@
 
   /*
-   * If we have any buffers in the sync queue move then to the modified
+   * If we have any buffers in the sync queue move them to the modified
    * list. The first sync buffer will select the device we use.
    */
@@ -1991,12 +1991,12 @@
 
   /*
-   * We have all the buffers that have been modified for this device so
-   * the pool can be unlocked because the state is set to TRANSFER.
-   */
-
+   * We have all the buffers that have been modified for this device so the
+   * pool can be unlocked because the state of each buffer has been set to
+   * TRANSFER.
+   */
   rtems_bdbuf_unlock_pool (pool);
 
   /*
-   * If there are buffers to transfer to the media tranfer them.
+   * If there are buffers to transfer to the media transfer them.
    */
   if (rtems_chain_is_empty (&transfer))
@@ -2005,6 +2005,6 @@
   {
     /*
-     * Obtain the disk device. Release the pool mutex to avoid a dead
-     * lock.
+     * Obtain the disk device. The pool's mutex has been released to avoid a
+     * dead lock.
      */
     dd = rtems_disk_obtain (dev);
@@ -2021,12 +2021,11 @@
       /*
        * Take as many buffers as configured and pass to the driver. Note, the
-       * API to the drivers has the array of buffers and if a chain was passed
+       * API to the drivers has an array of buffers and if a chain was passed
        * we could have just passed the list. If the driver API is updated it
        * should be possible to make this change with little effect in this
        * code. The array that is passed is broken in design and should be
-       * removed. Merging to members of a struct into the first member is
+       * removed. Merging members of a struct into the first member is
        * trouble waiting to happen.
        */
-
       write_req->status = RTEMS_RESOURCE_IN_USE;
       write_req->error = 0;
Index: cpukit/libblock/src/bdpart.c
===================================================================
--- cpukit/libblock/src/bdpart.c	(revision 4670d91898a0571866cca239b39d20281f3f88c6)
+++ cpukit/libblock/src/bdpart.c	(revision 7baa484300d36a9ced34f6642501f91fd1428461)
@@ -111,4 +111,7 @@
 }
 
+/*
+ * FIXME: This code should the deviceio interface and not the bdbug interface.
+ */
 static rtems_status_code rtems_bdpart_get_disk_data(
   const char *disk_name,
@@ -129,5 +132,5 @@
     return RTEMS_INVALID_NAME;
   }
-  *disk = st.st_dev;
+  *disk = st.st_rdev;
 
   /* Get disk begin, end and block size */
Index: cpukit/libblock/src/ide_part_table.c
===================================================================
--- cpukit/libblock/src/ide_part_table.c	(revision 4670d91898a0571866cca239b39d20281f3f88c6)
+++ cpukit/libblock/src/ide_part_table.c	(revision 7baa484300d36a9ced34f6642501f91fd1428461)
@@ -468,5 +468,5 @@
 
     strncpy (disk_desc->dev_name, dev_name, 15);
-    disk_desc->dev = dev_stat.st_dev;
+    disk_desc->dev = dev_stat.st_rdev;
     disk_desc->sector_size = (dev_stat.st_blksize) ? dev_stat.st_blksize :
                                               RTEMS_IDE_SECTOR_SIZE;
