Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[net-next-2.6.git] / fs / ext3 / balloc.c

diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
index 4a32511f4deda7f75b45aeb719d41407e416cb55..b3db22649426262e902f66f6c46275750c781e5b 100644 (file)
--- a/fs/ext3/balloc.c
+++ b/fs/ext3/balloc.c
@@ -792,9 +792,9 @@ find_next_usable_block(ext3_grpblk_t start, struct buffer_head *bh,
        if (here < 0)
                here = 0;
 
-       p = ((char *)bh->b_data) + (here >> 3);
+       p = bh->b_data + (here >> 3);
        r = memscan(p, 0, ((maxblocks + 7) >> 3) - (here >> 3));
-       next = (r - ((char *)bh->b_data)) << 3;
+       next = (r - bh->b_data) << 3;
 
        if (next < maxblocks && next >= start && ext3_test_allocatable(next, bh))
                return next;
@@ -810,8 +810,9 @@ find_next_usable_block(ext3_grpblk_t start, struct buffer_head *bh,
 
 /**
  * claim_block()
+ * @lock:              the spin lock for this block group
  * @block:             the free block (group relative) to allocate
- * @bh:                        the bufferhead containts the block group bitmap
+ * @bh:                        the buffer_head contains the block group bitmap
  *
  * We think we can allocate this block in this bitmap.  Try to set the bit.
  * If that succeeds then check that nobody has allocated and then freed the
@@ -956,9 +957,11 @@ fail_access:
  *             but we will shift to the place where start_block is,
  *             then start from there, when looking for a reservable space.
  *
- *     @size: the target new reservation window size
+ *     @my_rsv: the reservation window
  *
- *     @group_first_block: the first block we consider to start
+ *     @sb: the super block
+ *
+ *     @start_block: the first block we consider to start
  *                     the real search from
  *
  *     @last_block:
@@ -1084,7 +1087,7 @@ static int find_next_reservable_window(
  *
  *     failed: we failed to find a reservation window in this group
  *
- *     @rsv: the reservation
+ *     @my_rsv: the reservation window
  *
  *     @grp_goal: The goal (group-relative).  It is where the search for a
  *             free reservable space should start from.
@@ -1273,8 +1276,8 @@ static void try_to_extend_reservation(struct ext3_reserve_window_node *my_rsv,
  * @group:             given allocation block group
  * @bitmap_bh:         bufferhead holds the block bitmap
  * @grp_goal:          given target block within the group
- * @count:             target number of blocks to allocate
  * @my_rsv:            reservation window
+ * @count:             target number of blocks to allocate
  * @errp:              pointer to store the error code
  *
  * This is the main function used to allocate a new block and its reservation