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/linux-2.6/xfs_aops.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/linux-2.6/xfs_aops.h')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_aops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_aops.h b/fs/xfs/linux-2.6/xfs_aops.h index 795699f121d2..60716543c68b 100644 --- a/fs/xfs/linux-2.6/xfs_aops.h +++ b/fs/xfs/linux-2.6/xfs_aops.h | |||
| @@ -41,6 +41,6 @@ typedef struct xfs_ioend { | |||
| 41 | } xfs_ioend_t; | 41 | } xfs_ioend_t; |
| 42 | 42 | ||
| 43 | extern struct address_space_operations xfs_address_space_operations; | 43 | extern struct address_space_operations xfs_address_space_operations; |
| 44 | extern int xfs_get_block(struct inode *, sector_t, struct buffer_head *, int); | 44 | extern int xfs_get_blocks(struct inode *, sector_t, struct buffer_head *, int); |
| 45 | 45 | ||
| 46 | #endif /* __XFS_IOPS_H__ */ | 46 | #endif /* __XFS_IOPS_H__ */ |