diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-29 11:55:36 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-29 11:55:36 -0500 |
commit | e71ac6032edf77a1e4a81f3e3b260807e94b37a5 (patch) | |
tree | 62dc600d81f214d44b9e42c0c2316e1a2259c5e9 /fs/xfs/xfs_dir2_leaf.c | |
parent | 224b148ef7c9a00642eb33dbdf62f2840bde974f (diff) | |
parent | c25366680bab32efcbb5eda5f3c202099ba27b81 (diff) |
Merge git://oss.sgi.com:8090/oss/git/xfs-2.6
* git://oss.sgi.com:8090/oss/git/xfs-2.6:
[XFS] Cleanup in XFS after recent get_block_t interface tweaks.
[XFS] Remove unused/obsoleted function: xfs_bmap_do_search_extents()
[XFS] A change to inode chunk allocation to try allocating the new chunk
Fixes a regression from the recent "remove ->get_blocks() support"
[XFS] Fix compiler warning and small code inconsistencies in compat
[XFS] We really suck at spulling. Thanks to Chris Pascoe for fixing all
Diffstat (limited to 'fs/xfs/xfs_dir2_leaf.c')
-rw-r--r-- | fs/xfs/xfs_dir2_leaf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_dir2_leaf.c b/fs/xfs/xfs_dir2_leaf.c index 08648b18265c..0f5e2f2ce6ec 100644 --- a/fs/xfs/xfs_dir2_leaf.c +++ b/fs/xfs/xfs_dir2_leaf.c | |||
@@ -515,7 +515,7 @@ xfs_dir2_leaf_addname( | |||
515 | ASSERT(be32_to_cpu(leaf->ents[highstale].address) == | 515 | ASSERT(be32_to_cpu(leaf->ents[highstale].address) == |
516 | XFS_DIR2_NULL_DATAPTR); | 516 | XFS_DIR2_NULL_DATAPTR); |
517 | /* | 517 | /* |
518 | * Copy entries down to copver the stale entry | 518 | * Copy entries down to cover the stale entry |
519 | * and make room for the new entry. | 519 | * and make room for the new entry. |
520 | */ | 520 | */ |
521 | if (highstale - index > 0) | 521 | if (highstale - index > 0) |