diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2010-03-04 12:03:16 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2010-03-04 12:04:51 -0500 |
| commit | 4ea41e2de5bba756858bb40f964e3490b6d1a25c (patch) | |
| tree | 51a688be321dd42f80d8a0c966eb6a60408d50b3 /fs/xfs/xfs_mru_cache.h | |
| parent | 8d75da8afd068fa58b35e69c7c8c46770d9e7a98 (diff) | |
| parent | 398007f863a4af2b4a5a07219c5a617f1a098115 (diff) | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs into for-2.6.34-incoming
Resolve merge conflict in fs/xfs/linux-2.6/xfs_export.c.
Diffstat (limited to 'fs/xfs/xfs_mru_cache.h')
| -rw-r--r-- | fs/xfs/xfs_mru_cache.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xfs/xfs_mru_cache.h b/fs/xfs/xfs_mru_cache.h index 5d439f34b0c9..36dd3ec8b4eb 100644 --- a/fs/xfs/xfs_mru_cache.h +++ b/fs/xfs/xfs_mru_cache.h | |||
| @@ -42,7 +42,6 @@ void xfs_mru_cache_uninit(void); | |||
| 42 | int xfs_mru_cache_create(struct xfs_mru_cache **mrup, unsigned int lifetime_ms, | 42 | int xfs_mru_cache_create(struct xfs_mru_cache **mrup, unsigned int lifetime_ms, |
| 43 | unsigned int grp_count, | 43 | unsigned int grp_count, |
| 44 | xfs_mru_cache_free_func_t free_func); | 44 | xfs_mru_cache_free_func_t free_func); |
| 45 | void xfs_mru_cache_flush(xfs_mru_cache_t *mru); | ||
| 46 | void xfs_mru_cache_destroy(struct xfs_mru_cache *mru); | 45 | void xfs_mru_cache_destroy(struct xfs_mru_cache *mru); |
| 47 | int xfs_mru_cache_insert(struct xfs_mru_cache *mru, unsigned long key, | 46 | int xfs_mru_cache_insert(struct xfs_mru_cache *mru, unsigned long key, |
| 48 | void *value); | 47 | void *value); |