diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-02-19 04:30:27 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-02-19 04:30:27 +0000 |
| commit | 8e4d8ce5e5643ae5be3d077a03d0266cfa7a74b4 (patch) | |
| tree | fa2284408ca7a7c151192b531ca9ef8a78fedff0 /ufs/alloc.c | |
| parent | a0a2eed0f2f4b3f4a0a988b58f594adb8a1c24bf (diff) | |
| parent | 93ba48b6534f44c41f5739505dc9943d760a1867 (diff) | |
Merge remote-tracking branch 'mainline/master' into dde
Conflicts:
Makefile
boot/ChangeLog
boot/boot.c
configure
configure.in
doc/ChangeLog
libdiskfs/ChangeLog
libdiskfs/boot-start.c
libports/manage-multithread.c
libthreads/ChangeLog
libthreads/alpha/thread.c
pfinet/ChangeLog
pfinet/iioctl-ops.c
pfinet/linux-src/net/ipv6/addrconf.c
pfinet/linux-src/net/ipv6/icmpv6.c
utils/settrans.c
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 |