diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:20:08 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:20:08 +0000 |
| commit | 953c525d7589178629f3e91e4bf4ea805a92a5b4 (patch) | |
| tree | 9411cddbd2f213fe4edf2150e2e8b02a9d27b4bf /ext2fs/balloc.c | |
| parent | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (diff) | |
| parent | 5430151902aa7cb17458c0d71722a05fd379babf (diff) | |
| download | hurd-953c525d7589178629f3e91e4bf4ea805a92a5b4.tar.gz hurd-953c525d7589178629f3e91e4bf4ea805a92a5b4.tar.bz2 hurd-953c525d7589178629f3e91e4bf4ea805a92a5b4.zip | |
Merge branch 'master' into xkb
Conflicts:
console-client/Makefile
Diffstat (limited to 'ext2fs/balloc.c')
| -rw-r--r-- | ext2fs/balloc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ext2fs/balloc.c b/ext2fs/balloc.c index 7333123c..7fe82ba0 100644 --- a/ext2fs/balloc.c +++ b/ext2fs/balloc.c @@ -197,8 +197,11 @@ repeat: * The goal was occupied; search forward for a free * block within the next 32 blocks */ - lmap = ((((unsigned long *) bh)[j >> 5]) >> - ((j & 31) + 1)); + if ((j & 31) == 31) + lmap = 0; + else + lmap = ((((unsigned long *) bh)[j >> 5]) >> + ((j & 31) + 1)); if (j < sblock->s_blocks_per_group - 32) lmap |= (((unsigned long *) bh)[(j >> 5) + 1]) << (31 - (j & 31)); |