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_behavior.h | |
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_behavior.h')
-rw-r--r-- | fs/xfs/xfs_behavior.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_behavior.h b/fs/xfs/xfs_behavior.h index 2cd89bb5ab10..1d8ff103201c 100644 --- a/fs/xfs/xfs_behavior.h +++ b/fs/xfs/xfs_behavior.h | |||
@@ -39,7 +39,7 @@ | |||
39 | * behaviors is synchronized with operations-in-progress (oip's) so that | 39 | * behaviors is synchronized with operations-in-progress (oip's) so that |
40 | * the oip's always see a consistent view of the chain. | 40 | * the oip's always see a consistent view of the chain. |
41 | * | 41 | * |
42 | * The term "interpostion" is used to refer to the act of inserting | 42 | * The term "interposition" is used to refer to the act of inserting |
43 | * a behavior such that it interposes on (i.e., is inserted in front | 43 | * a behavior such that it interposes on (i.e., is inserted in front |
44 | * of) a particular other behavior. A key example of this is when a | 44 | * of) a particular other behavior. A key example of this is when a |
45 | * system implementing distributed single system image wishes to | 45 | * system implementing distributed single system image wishes to |
@@ -51,7 +51,7 @@ | |||
51 | * | 51 | * |
52 | * Behavior synchronization is logic which is necessary under certain | 52 | * Behavior synchronization is logic which is necessary under certain |
53 | * circumstances that there is no conflict between ongoing operations | 53 | * circumstances that there is no conflict between ongoing operations |
54 | * traversing the behavior chain and those dunamically modifying the | 54 | * traversing the behavior chain and those dynamically modifying the |
55 | * behavior chain. Because behavior synchronization adds extra overhead | 55 | * behavior chain. Because behavior synchronization adds extra overhead |
56 | * to virtual operation invocation, we want to restrict, as much as | 56 | * to virtual operation invocation, we want to restrict, as much as |
57 | * we can, the requirement for this extra code, to those situations | 57 | * we can, the requirement for this extra code, to those situations |