Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64419d93 authored by Pekka Enberg's avatar Pekka Enberg Committed by Anton Altaparmakov
Browse files

NTFS: We have struct kmem_cache now so use it instead of the typedef. 



Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarAnton Altaparmakov <aia21@cantab.net>
parent 0f36b018

fs/ntfs/ntfs.h

+5 −5
Original line number Diff line number Diff line
@@ -50,11 +50,11 @@ typedef enum { 
/* Global variables. */



/* Slab caches (from super.c). */

extern kmem_cache_t *ntfs_name_cache;

extern kmem_cache_t *ntfs_inode_cache;

extern kmem_cache_t *ntfs_big_inode_cache;

extern kmem_cache_t *ntfs_attr_ctx_cache;

extern kmem_cache_t *ntfs_index_ctx_cache;

extern struct kmem_cache *ntfs_name_cache;

extern struct kmem_cache *ntfs_inode_cache;

extern struct kmem_cache *ntfs_big_inode_cache;

extern struct kmem_cache *ntfs_attr_ctx_cache;

extern struct kmem_cache *ntfs_index_ctx_cache;



/* The various operations structs defined throughout the driver files. */

extern struct address_space_operations ntfs_aops;

fs/ntfs/super.c

+6 −6
Original line number Diff line number Diff line
@@ -2987,14 +2987,14 @@ err_out_now: 
 * strings of the maximum length allowed by NTFS, which is NTFS_MAX_NAME_LEN

 * (255) Unicode characters + a terminating NULL Unicode character.

 */

kmem_cache_t *ntfs_name_cache;

struct kmem_cache *ntfs_name_cache;



/* Slab caches for efficient allocation/deallocation of inodes. */

kmem_cache_t *ntfs_inode_cache;

kmem_cache_t *ntfs_big_inode_cache;

struct kmem_cache *ntfs_inode_cache;

struct kmem_cache *ntfs_big_inode_cache;



/* Init once constructor for the inode slab cache. */

static void ntfs_big_inode_init_once(void *foo, kmem_cache_t *cachep,

static void ntfs_big_inode_init_once(void *foo, struct kmem_cache *cachep,

		unsigned long flags)

{

	ntfs_inode *ni = (ntfs_inode *)foo;
@@ -3008,8 +3008,8 @@ static void ntfs_big_inode_init_once(void *foo, kmem_cache_t *cachep, 
 * Slab caches to optimize allocations and deallocations of attribute search

 * contexts and index contexts, respectively.

 */

kmem_cache_t *ntfs_attr_ctx_cache;

kmem_cache_t *ntfs_index_ctx_cache;

struct kmem_cache *ntfs_attr_ctx_cache;

struct kmem_cache *ntfs_index_ctx_cache;



/* Driver wide semaphore. */

DECLARE_MUTEX(ntfs_lock);