diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
| commit | 21b4e736922f546e0f1aa7b9d6c442f309a2444a (patch) | |
| tree | e1be8645297f8ebe87445251743ebcc52081a20d /fs/jbd2/revoke.c | |
| parent | 34161db6b14d984fb9b06c735b7b42f8803f6851 (diff) | |
| parent | 68380b581383c028830f79ec2670f4a193854aa6 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
Diffstat (limited to 'fs/jbd2/revoke.c')
| -rw-r--r-- | fs/jbd2/revoke.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jbd2/revoke.c b/fs/jbd2/revoke.c index 380d19917f37..f506646ad0ff 100644 --- a/fs/jbd2/revoke.c +++ b/fs/jbd2/revoke.c | |||
| @@ -70,8 +70,8 @@ | |||
| 70 | #include <linux/init.h> | 70 | #include <linux/init.h> |
| 71 | #endif | 71 | #endif |
| 72 | 72 | ||
| 73 | static kmem_cache_t *jbd2_revoke_record_cache; | 73 | static struct kmem_cache *jbd2_revoke_record_cache; |
| 74 | static kmem_cache_t *jbd2_revoke_table_cache; | 74 | static struct kmem_cache *jbd2_revoke_table_cache; |
| 75 | 75 | ||
| 76 | /* Each revoke record represents one single revoked block. During | 76 | /* Each revoke record represents one single revoked block. During |
| 77 | journal replay, this involves recording the transaction ID of the | 77 | journal replay, this involves recording the transaction ID of the |