Attachment 159621 Details for Bug 245009 – Proposed patch

[patch] Proposed patch

245009.patch (text/plain), 1.53 KB, created by Robert Peterson on 2007-07-19 22:29:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Peterson

Created: 2007-07-19 22:29:33 UTC

Size: 1.53 KB

patch

obsolete

>--- /gfs2-2.6.git/fs/gfs2/rgrp.c	2007-07-17 16:14:16.000000000 -0500
>+++ rgrp.c	2007-07-19 17:10:10.000000000 -0500
>@@ -116,8 +116,7 @@ static unsigned char gfs2_testbit(struct
>  * @buffer: the buffer that holds the bitmaps
>  * @buflen: the length (in bytes) of the buffer
>  * @goal: start search at this block's bit-pair (within @buffer)
>- * @old_state: GFS2_BLKST_XXX the state of the block we're looking for;
>- *       bit 0 = alloc(1)/free(0), bit 1 = meta(1)/data(0)
>+ * @old_state: GFS2_BLKST_XXX the state of the block we're looking for.
>  *
>  * Scope of @goal and returned block number is only within this bitmap buffer,
>  * not entire rgrp or filesystem.  @buffer will be offset from the actual
>@@ -137,9 +136,13 @@ static u32 gfs2_bitfit(struct gfs2_rgrpd
> 	byte = buffer + (goal / GFS2_NBBY);
> 	bit = (goal % GFS2_NBBY) * GFS2_BIT_SIZE;
> 	end = buffer + buflen;
>-	alloc = (old_state & 1) ? 0 : 0x55;
>+	alloc = (old_state == GFS2_BLKST_FREE) ? 0x55 : 0;
> 
> 	while (byte < end) {
>+		/* If we're looking for a free block we can eliminate all
>+		   bitmap settings with 0x55, which represents four data
>+		   blocks in a row.  If we're looking for a data block, we can
>+		   eliminate 0x00 which corresponds to four free blocks. */
> 		if ((*byte & 0x55) == alloc) {
> 			blk += (8 - bit) >> 1;
> 
>@@ -876,7 +879,7 @@ static struct inode *try_rgrp_unlink(str
> 		*last_unlinked = no_addr;
> 		inode = gfs2_inode_lookup(rgd->rd_sbd->sd_vfs, DT_UNKNOWN,
> 					  no_addr, -1);
>-		if (!IS_ERR(inode))
>+		if (!inode->i_private && !IS_ERR(inode))
> 			return inode;
> 	}
>

Actions: View | Diff

Attachments on bug 245009: 157475 | 159314 | 159621