diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
commit | fb2853a555984c7dea882ea7622636699b922687 (patch) | |
tree | d5a74ea1d8c6f15f98bcd1c30a9a665c4bccb375 /ufs/alloc.c | |
parent | 555a202f0debbb1f9ac81bc449ba9084a6d847a2 (diff) | |
parent | 033f502218f0a8f1996821c70bc007d8f08bf9ed (diff) |
Merge branch 'master' into xkb
Conflicts:
config.make.in
configure.in
Diffstat (limited to 'ufs/alloc.c')
-rw-r--r-- | ufs/alloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ufs/alloc.c b/ufs/alloc.c index 48ee60cc..d8f92255 100644 --- a/ufs/alloc.c +++ b/ufs/alloc.c @@ -215,7 +215,7 @@ release_cg (struct cg *cgp) * 3) allocate a block in the same cylinder group. * 4) quadradically rehash into other cylinder groups, until an * available block is located. - * If no block preference is given the following heirarchy is used + * If no block preference is given the following hierarchy is used * to allocate a block: * 1) allocate a block in the cylinder group that contains the * inode for the file. @@ -472,7 +472,7 @@ nospace: * logical blocks to be made contiguous is given. The allocator attempts * to find a range of sequential blocks starting as close as possible to * an fs_rotdelay offset from the end of the allocation for the logical - * block immediately preceeding the current range. If successful, the + * block immediately preceding the current range. If successful, the * physical block numbers in the buffer pointers and in the inode are * changed to reflect the new allocation. If unsuccessful, the allocation * is left unchanged. The success in doing the reallocation is returned. @@ -638,7 +638,7 @@ fail: * 2) allocate an inode in the same cylinder group. * 3) quadradically rehash into other cylinder groups, until an * available inode is located. - * If no inode preference is given the following heirarchy is used + * If no inode preference is given the following hierarchy is used * to allocate an inode: * 1) allocate an inode in cylinder group 0. * 2) quadradically rehash into other cylinder groups, until an |