aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorBob Peterson <rpeterso@redhat.com>2007-07-12 16:58:50 -0500
committerSteven Whitehouse <swhiteho@redhat.com>2007-08-14 10:32:43 +0100
commit24c7387333c77b602ece7ecd6a85fc94f8f16d8c (patch)
tree8fd9bba4310f176d8c538e2a22c083882b10dec5 /fs
parentbdcb88562ca90e6cfac13130e147c63aaa4f9e41 (diff)
downloadkernel_samsung_smdk4412-24c7387333c77b602ece7ecd6a85fc94f8f16d8c.zip
kernel_samsung_smdk4412-24c7387333c77b602ece7ecd6a85fc94f8f16d8c.tar.gz
kernel_samsung_smdk4412-24c7387333c77b602ece7ecd6a85fc94f8f16d8c.tar.bz2
[GFS2] soft lockup in rgblk_search
This patch seems to fix the problem described in bugzilla bug 246114. It was written by Steve Whitehouse with some tweaking by me. The code was looping in the relatively new section of code designed to search for and reuse unlinked inodes. In cases where it was finding an appropriate inode to reuse, it was looping around and finding the same block over and over because a "<=" check should have been a "<" when comparing the goal block to the last unlinked block found. Signed-off-by: Bob Peterson <rpeterso@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/gfs2/rgrp.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index e4e0406..bb58e69 100644
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -863,16 +863,19 @@ static struct inode *try_rgrp_unlink(struct gfs2_rgrpd *rgd, u64 *last_unlinked)
u64 no_addr;
for(;;) {
+ if (goal >= rgd->rd_data)
+ break;
goal = rgblk_search(rgd, goal, GFS2_BLKST_UNLINKED,
GFS2_BLKST_UNLINKED);
if (goal == 0)
- return 0;
+ break;
no_addr = goal + rgd->rd_data0;
- if (no_addr <= *last_unlinked)
+ goal++;
+ if (no_addr < *last_unlinked)
continue;
*last_unlinked = no_addr;
inode = gfs2_inode_lookup(rgd->rd_sbd->sd_vfs, DT_UNKNOWN,
- no_addr, -1);
+ no_addr, -1);
if (!IS_ERR(inode))
return inode;
}