diff options
author | Pekka Enberg <penberg@cs.helsinki.fi> | 2006-02-05 16:43:57 -0500 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2006-02-05 16:43:57 -0500 |
commit | 64419d93a5906600af5817ad0cae3c6ecf7fb389 (patch) | |
tree | 9bb76dcc8b19580a2b177418c3a3cbe91c703126 /fs | |
parent | 0f36b018b2e314d45af86449f1a97facb1fbe300 (diff) |
NTFS: We have struct kmem_cache now so use it instead of the typedef.
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ntfs/ntfs.h | 10 | ||||
-rw-r--r-- | fs/ntfs/super.c | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/fs/ntfs/ntfs.h b/fs/ntfs/ntfs.h index 446b5014115..653d2a5c489 100644 --- a/fs/ntfs/ntfs.h +++ b/fs/ntfs/ntfs.h | |||
@@ -50,11 +50,11 @@ typedef enum { | |||
50 | /* Global variables. */ | 50 | /* Global variables. */ |
51 | 51 | ||
52 | /* Slab caches (from super.c). */ | 52 | /* Slab caches (from super.c). */ |
53 | extern kmem_cache_t *ntfs_name_cache; | 53 | extern struct kmem_cache *ntfs_name_cache; |
54 | extern kmem_cache_t *ntfs_inode_cache; | 54 | extern struct kmem_cache *ntfs_inode_cache; |
55 | extern kmem_cache_t *ntfs_big_inode_cache; | 55 | extern struct kmem_cache *ntfs_big_inode_cache; |
56 | extern kmem_cache_t *ntfs_attr_ctx_cache; | 56 | extern struct kmem_cache *ntfs_attr_ctx_cache; |
57 | extern kmem_cache_t *ntfs_index_ctx_cache; | 57 | extern struct kmem_cache *ntfs_index_ctx_cache; |
58 | 58 | ||
59 | /* The various operations structs defined throughout the driver files. */ | 59 | /* The various operations structs defined throughout the driver files. */ |
60 | extern struct address_space_operations ntfs_aops; | 60 | extern struct address_space_operations ntfs_aops; |
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c index c3a3f1a8310..e9c0d80dfab 100644 --- a/fs/ntfs/super.c +++ b/fs/ntfs/super.c | |||
@@ -2987,14 +2987,14 @@ err_out_now: | |||
2987 | * strings of the maximum length allowed by NTFS, which is NTFS_MAX_NAME_LEN | 2987 | * strings of the maximum length allowed by NTFS, which is NTFS_MAX_NAME_LEN |
2988 | * (255) Unicode characters + a terminating NULL Unicode character. | 2988 | * (255) Unicode characters + a terminating NULL Unicode character. |
2989 | */ | 2989 | */ |
2990 | kmem_cache_t *ntfs_name_cache; | 2990 | struct kmem_cache *ntfs_name_cache; |
2991 | 2991 | ||
2992 | /* Slab caches for efficient allocation/deallocation of inodes. */ | 2992 | /* Slab caches for efficient allocation/deallocation of inodes. */ |
2993 | kmem_cache_t *ntfs_inode_cache; | 2993 | struct kmem_cache *ntfs_inode_cache; |
2994 | kmem_cache_t *ntfs_big_inode_cache; | 2994 | struct kmem_cache *ntfs_big_inode_cache; |
2995 | 2995 | ||
2996 | /* Init once constructor for the inode slab cache. */ | 2996 | /* Init once constructor for the inode slab cache. */ |
2997 | static void ntfs_big_inode_init_once(void *foo, kmem_cache_t *cachep, | 2997 | static void ntfs_big_inode_init_once(void *foo, struct kmem_cache *cachep, |
2998 | unsigned long flags) | 2998 | unsigned long flags) |
2999 | { | 2999 | { |
3000 | ntfs_inode *ni = (ntfs_inode *)foo; | 3000 | ntfs_inode *ni = (ntfs_inode *)foo; |
@@ -3008,8 +3008,8 @@ static void ntfs_big_inode_init_once(void *foo, kmem_cache_t *cachep, | |||
3008 | * Slab caches to optimize allocations and deallocations of attribute search | 3008 | * Slab caches to optimize allocations and deallocations of attribute search |
3009 | * contexts and index contexts, respectively. | 3009 | * contexts and index contexts, respectively. |
3010 | */ | 3010 | */ |
3011 | kmem_cache_t *ntfs_attr_ctx_cache; | 3011 | struct kmem_cache *ntfs_attr_ctx_cache; |
3012 | kmem_cache_t *ntfs_index_ctx_cache; | 3012 | struct kmem_cache *ntfs_index_ctx_cache; |
3013 | 3013 | ||
3014 | /* Driver wide semaphore. */ | 3014 | /* Driver wide semaphore. */ |
3015 | DECLARE_MUTEX(ntfs_lock); | 3015 | DECLARE_MUTEX(ntfs_lock); |