Skip to content

L
linux
Commit 7a2508e1 authored by Jan Kara's avatar Jan Kara Committed by Theodore Ts'o
Browse files
Options

mbcache2: rename to mbcache 

Since old mbcache code is gone, let's rename new code to mbcache since
number 2 is now meaningless. This is just a mechanical replacement.
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent f0c8b462
Show whitespace changes
Inline Side-by-side
Showing with 204 additions and 151 deletions
fs/Makefile
View file @ 7a2508e1
...@@ -41,7 +41,7 @@ obj-$(CONFIG_COMPAT_BINFMT_ELF) += compat_binfmt_elf.o ...@@ -41,7 +41,7 @@ obj-$(CONFIG_COMPAT_BINFMT_ELF) += compat_binfmt_elf.o
obj-$(CONFIG_BINFMT_ELF_FDPIC) += binfmt_elf_fdpic.o obj-$(CONFIG_BINFMT_ELF_FDPIC) += binfmt_elf_fdpic.o
obj-$(CONFIG_BINFMT_FLAT) += binfmt_flat.o obj-$(CONFIG_BINFMT_FLAT) += binfmt_flat.o
obj-$(CONFIG_FS_MBCACHE) += mbcache2.o obj-$(CONFIG_FS_MBCACHE) += mbcache.o
obj-$(CONFIG_FS_POSIX_ACL) += posix_acl.o obj-$(CONFIG_FS_POSIX_ACL) += posix_acl.o
obj-$(CONFIG_NFS_COMMON) += nfs_common/ obj-$(CONFIG_NFS_COMMON) += nfs_common/
obj-$(CONFIG_COREDUMP) += coredump.o obj-$(CONFIG_COREDUMP) += coredump.o
......
fs/ext2/ext2.h
View file @ 7a2508e1
...@@ -61,7 +61,7 @@ struct ext2_block_alloc_info { ...@@ -61,7 +61,7 @@ struct ext2_block_alloc_info {
#define rsv_start rsv_window._rsv_start #define rsv_start rsv_window._rsv_start
#define rsv_end rsv_window._rsv_end #define rsv_end rsv_window._rsv_end
struct mb2_cache; struct mb_cache;
/* /*
* second extended-fs super-block data in memory * second extended-fs super-block data in memory
...@@ -113,7 +113,7 @@ struct ext2_sb_info { ...@@ -113,7 +113,7 @@ struct ext2_sb_info {
* of the mount options. * of the mount options.
*/ */
spinlock_t s_lock; spinlock_t s_lock;
struct mb2_cache *s_mb_cache; struct mb_cache *s_mb_cache;
}; };
static inline spinlock_t * static inline spinlock_t *
......
fs/ext2/xattr.c
View file @ 7a2508e1
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/mbcache2.h> #include <linux/mbcache.h>
#include <linux/quotaops.h> #include <linux/quotaops.h>
#include <linux/rwsem.h> #include <linux/rwsem.h>
#include <linux/security.h> #include <linux/security.h>
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
static int ext2_xattr_set2(struct inode *, struct buffer_head *, static int ext2_xattr_set2(struct inode *, struct buffer_head *,
struct ext2_xattr_header *); struct ext2_xattr_header *);
static int ext2_xattr_cache_insert(struct mb2_cache *, struct buffer_head *); static int ext2_xattr_cache_insert(struct mb_cache *, struct buffer_head *);
static struct buffer_head *ext2_xattr_cache_find(struct inode *, static struct buffer_head *ext2_xattr_cache_find(struct inode *,
struct ext2_xattr_header *); struct ext2_xattr_header *);
static void ext2_xattr_rehash(struct ext2_xattr_header *, static void ext2_xattr_rehash(struct ext2_xattr_header *,
...@@ -150,7 +150,7 @@ ext2_xattr_get(struct inode *inode, int name_index, const char *name, ...@@ -150,7 +150,7 @@ ext2_xattr_get(struct inode *inode, int name_index, const char *name,
size_t name_len, size; size_t name_len, size;
char *end; char *end;
int error; int error;
struct mb2_cache *ext2_mb_cache = EXT2_SB(inode->i_sb)->s_mb_cache; struct mb_cache *ext2_mb_cache = EXT2_SB(inode->i_sb)->s_mb_cache;
ea_idebug(inode, "name=%d.%s, buffer=%p, buffer_size=%ld", ea_idebug(inode, "name=%d.%s, buffer=%p, buffer_size=%ld",
name_index, name, buffer, (long)buffer_size); name_index, name, buffer, (long)buffer_size);
...@@ -246,7 +246,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size) ...@@ -246,7 +246,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
char *end; char *end;
size_t rest = buffer_size; size_t rest = buffer_size;
int error; int error;
struct mb2_cache *ext2_mb_cache = EXT2_SB(inode->i_sb)->s_mb_cache; struct mb_cache *ext2_mb_cache = EXT2_SB(inode->i_sb)->s_mb_cache;
ea_idebug(inode, "buffer=%p, buffer_size=%ld", ea_idebug(inode, "buffer=%p, buffer_size=%ld",
buffer, (long)buffer_size); buffer, (long)buffer_size);
...@@ -493,7 +493,7 @@ bad_block: ext2_error(sb, "ext2_xattr_set", ...@@ -493,7 +493,7 @@ bad_block: ext2_error(sb, "ext2_xattr_set",
* This must happen under buffer lock for * This must happen under buffer lock for
* ext2_xattr_set2() to reliably detect modified block * ext2_xattr_set2() to reliably detect modified block
*/ */
mb2_cache_entry_delete_block(EXT2_SB(sb)->s_mb_cache, mb_cache_entry_delete_block(EXT2_SB(sb)->s_mb_cache,
hash, bh->b_blocknr); hash, bh->b_blocknr);
/* keep the buffer locked while modifying it. */ /* keep the buffer locked while modifying it. */
...@@ -627,7 +627,7 @@ ext2_xattr_set2(struct inode *inode, struct buffer_head *old_bh, ...@@ -627,7 +627,7 @@ ext2_xattr_set2(struct inode *inode, struct buffer_head *old_bh,
struct super_block *sb = inode->i_sb; struct super_block *sb = inode->i_sb;
struct buffer_head *new_bh = NULL; struct buffer_head *new_bh = NULL;
int error; int error;
struct mb2_cache *ext2_mb_cache = EXT2_SB(sb)->s_mb_cache; struct mb_cache *ext2_mb_cache = EXT2_SB(sb)->s_mb_cache;
if (header) { if (header) {
new_bh = ext2_xattr_cache_find(inode, header); new_bh = ext2_xattr_cache_find(inode, header);
...@@ -721,7 +721,7 @@ ext2_xattr_set2(struct inode *inode, struct buffer_head *old_bh, ...@@ -721,7 +721,7 @@ ext2_xattr_set2(struct inode *inode, struct buffer_head *old_bh,
* This must happen under buffer lock for * This must happen under buffer lock for
* ext2_xattr_set2() to reliably detect freed block * ext2_xattr_set2() to reliably detect freed block
*/ */
mb2_cache_entry_delete_block(ext2_mb_cache, mb_cache_entry_delete_block(ext2_mb_cache,
hash, old_bh->b_blocknr); hash, old_bh->b_blocknr);
/* Free the old block. */ /* Free the old block. */
ea_bdebug(old_bh, "freeing"); ea_bdebug(old_bh, "freeing");
...@@ -786,7 +786,7 @@ ext2_xattr_delete_inode(struct inode *inode) ...@@ -786,7 +786,7 @@ ext2_xattr_delete_inode(struct inode *inode)
* This must happen under buffer lock for ext2_xattr_set2() to * This must happen under buffer lock for ext2_xattr_set2() to
* reliably detect freed block * reliably detect freed block
*/ */
mb2_cache_entry_delete_block(EXT2_SB(inode->i_sb)->s_mb_cache, mb_cache_entry_delete_block(EXT2_SB(inode->i_sb)->s_mb_cache,
hash, bh->b_blocknr); hash, bh->b_blocknr);
ext2_free_blocks(inode, EXT2_I(inode)->i_file_acl, 1); ext2_free_blocks(inode, EXT2_I(inode)->i_file_acl, 1);
get_bh(bh); get_bh(bh);
...@@ -818,12 +818,12 @@ ext2_xattr_delete_inode(struct inode *inode) ...@@ -818,12 +818,12 @@ ext2_xattr_delete_inode(struct inode *inode)
* Returns 0, or a negative error number on failure. * Returns 0, or a negative error number on failure.
*/ */
static int static int
ext2_xattr_cache_insert(struct mb2_cache *cache, struct buffer_head *bh) ext2_xattr_cache_insert(struct mb_cache *cache, struct buffer_head *bh)
{ {
__u32 hash = le32_to_cpu(HDR(bh)->h_hash); __u32 hash = le32_to_cpu(HDR(bh)->h_hash);
int error; int error;
error = mb2_cache_entry_create(cache, GFP_NOFS, hash, bh->b_blocknr); error = mb_cache_entry_create(cache, GFP_NOFS, hash, bh->b_blocknr);
if (error) { if (error) {
if (error == -EBUSY) { if (error == -EBUSY) {
ea_bdebug(bh, "already in cache (%d cache entries)", ea_bdebug(bh, "already in cache (%d cache entries)",
...@@ -887,14 +887,14 @@ static struct buffer_head * ...@@ -887,14 +887,14 @@ static struct buffer_head *
ext2_xattr_cache_find(struct inode *inode, struct ext2_xattr_header *header) ext2_xattr_cache_find(struct inode *inode, struct ext2_xattr_header *header)
{ {
__u32 hash = le32_to_cpu(header->h_hash); __u32 hash = le32_to_cpu(header->h_hash);
struct mb2_cache_entry *ce; struct mb_cache_entry *ce;
struct mb2_cache *ext2_mb_cache = EXT2_SB(inode->i_sb)->s_mb_cache; struct mb_cache *ext2_mb_cache = EXT2_SB(inode->i_sb)->s_mb_cache;
if (!header->h_hash) if (!header->h_hash)
return NULL; /* never share */ return NULL; /* never share */
ea_idebug(inode, "looking for cached blocks [%x]", (int)hash); ea_idebug(inode, "looking for cached blocks [%x]", (int)hash);
again: again:
ce = mb2_cache_entry_find_first(ext2_mb_cache, hash); ce = mb_cache_entry_find_first(ext2_mb_cache, hash);
while (ce) { while (ce) {
struct buffer_head *bh; struct buffer_head *bh;
...@@ -915,7 +915,7 @@ ext2_xattr_cache_find(struct inode *inode, struct ext2_xattr_header *header) ...@@ -915,7 +915,7 @@ ext2_xattr_cache_find(struct inode *inode, struct ext2_xattr_header *header)
* entry is still hashed is reliable. * entry is still hashed is reliable.
*/ */
if (hlist_bl_unhashed(&ce->e_hash_list)) { if (hlist_bl_unhashed(&ce->e_hash_list)) {
mb2_cache_entry_put(ext2_mb_cache, ce); mb_cache_entry_put(ext2_mb_cache, ce);
unlock_buffer(bh); unlock_buffer(bh);
brelse(bh); brelse(bh);
goto again; goto again;
...@@ -928,14 +928,14 @@ ext2_xattr_cache_find(struct inode *inode, struct ext2_xattr_header *header) ...@@ -928,14 +928,14 @@ ext2_xattr_cache_find(struct inode *inode, struct ext2_xattr_header *header)
} else if (!ext2_xattr_cmp(header, HDR(bh))) { } else if (!ext2_xattr_cmp(header, HDR(bh))) {
ea_bdebug(bh, "b_count=%d", ea_bdebug(bh, "b_count=%d",
atomic_read(&(bh->b_count))); atomic_read(&(bh->b_count)));
mb2_cache_entry_touch(ext2_mb_cache, ce); mb_cache_entry_touch(ext2_mb_cache, ce);
mb2_cache_entry_put(ext2_mb_cache, ce); mb_cache_entry_put(ext2_mb_cache, ce);
return bh; return bh;
} }
unlock_buffer(bh); unlock_buffer(bh);
brelse(bh); brelse(bh);
} }
ce = mb2_cache_entry_find_next(ext2_mb_cache, ce); ce = mb_cache_entry_find_next(ext2_mb_cache, ce);
} }
return NULL; return NULL;
} }
...@@ -1010,13 +1010,13 @@ static void ext2_xattr_rehash(struct ext2_xattr_header *header, ...@@ -1010,13 +1010,13 @@ static void ext2_xattr_rehash(struct ext2_xattr_header *header,
#define HASH_BUCKET_BITS 10 #define HASH_BUCKET_BITS 10
struct mb2_cache *ext2_xattr_create_cache(void) struct mb_cache *ext2_xattr_create_cache(void)
{ {
return mb2_cache_create(HASH_BUCKET_BITS); return mb_cache_create(HASH_BUCKET_BITS);
} }
void ext2_xattr_destroy_cache(struct mb2_cache *cache) void ext2_xattr_destroy_cache(struct mb_cache *cache)
{ {
if (cache) if (cache)
mb2_cache_destroy(cache); mb_cache_destroy(cache);
} }
fs/ext2/xattr.h
View file @ 7a2508e1
...@@ -53,7 +53,7 @@ struct ext2_xattr_entry { ...@@ -53,7 +53,7 @@ struct ext2_xattr_entry {
#define EXT2_XATTR_SIZE(size) \ #define EXT2_XATTR_SIZE(size) \
(((size) + EXT2_XATTR_ROUND) & ~EXT2_XATTR_ROUND) (((size) + EXT2_XATTR_ROUND) & ~EXT2_XATTR_ROUND)
struct mb2_cache; struct mb_cache;
# ifdef CONFIG_EXT2_FS_XATTR # ifdef CONFIG_EXT2_FS_XATTR
...@@ -68,8 +68,8 @@ extern int ext2_xattr_set(struct inode *, int, const char *, const void *, size_ ...@@ -68,8 +68,8 @@ extern int ext2_xattr_set(struct inode *, int, const char *, const void *, size_
extern void ext2_xattr_delete_inode(struct inode *); extern void ext2_xattr_delete_inode(struct inode *);
extern struct mb2_cache *ext2_xattr_create_cache(void); extern struct mb_cache *ext2_xattr_create_cache(void);
extern void ext2_xattr_destroy_cache(struct mb2_cache *cache); extern void ext2_xattr_destroy_cache(struct mb_cache *cache);
extern const struct xattr_handler *ext2_xattr_handlers[]; extern const struct xattr_handler *ext2_xattr_handlers[];
...@@ -94,7 +94,7 @@ ext2_xattr_delete_inode(struct inode *inode) ...@@ -94,7 +94,7 @@ ext2_xattr_delete_inode(struct inode *inode)
{ {
} }
static inline void ext2_xattr_destroy_cache(struct mb2_cache *cache) static inline void ext2_xattr_destroy_cache(struct mb_cache *cache)
{ {
} }
......
fs/ext4/ext4.h
View file @ 7a2508e1
...@@ -1468,7 +1468,7 @@ struct ext4_sb_info { ...@@ -1468,7 +1468,7 @@ struct ext4_sb_info {
struct list_head s_es_list; /* List of inodes with reclaimable extents */ struct list_head s_es_list; /* List of inodes with reclaimable extents */
long s_es_nr_inode; long s_es_nr_inode;
struct ext4_es_stats s_es_stats; struct ext4_es_stats s_es_stats;
struct mb2_cache *s_mb_cache; struct mb_cache *s_mb_cache;
spinlock_t s_es_lock ____cacheline_aligned_in_smp; spinlock_t s_es_lock ____cacheline_aligned_in_smp;
/* Ratelimit ext4 messages. */ /* Ratelimit ext4 messages. */
......
fs/ext4/xattr.c
View file @ 7a2508e1
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/mbcache2.h> #include <linux/mbcache.h>
#include <linux/quotaops.h> #include <linux/quotaops.h>
#include "ext4_jbd2.h" #include "ext4_jbd2.h"
#include "ext4.h" #include "ext4.h"
...@@ -78,10 +78,10 @@ ...@@ -78,10 +78,10 @@
# define ea_bdebug(bh, fmt, ...) no_printk(fmt, ##__VA_ARGS__) # define ea_bdebug(bh, fmt, ...) no_printk(fmt, ##__VA_ARGS__)
#endif #endif
static void ext4_xattr_cache_insert(struct mb2_cache *, struct buffer_head *); static void ext4_xattr_cache_insert(struct mb_cache *, struct buffer_head *);
static struct buffer_head *ext4_xattr_cache_find(struct inode *, static struct buffer_head *ext4_xattr_cache_find(struct inode *,
struct ext4_xattr_header *, struct ext4_xattr_header *,
struct mb2_cache_entry **); struct mb_cache_entry **);
static void ext4_xattr_rehash(struct ext4_xattr_header *, static void ext4_xattr_rehash(struct ext4_xattr_header *,
struct ext4_xattr_entry *); struct ext4_xattr_entry *);
static int ext4_xattr_list(struct dentry *dentry, char *buffer, static int ext4_xattr_list(struct dentry *dentry, char *buffer,
...@@ -276,7 +276,7 @@ ext4_xattr_block_get(struct inode *inode, int name_index, const char *name, ...@@ -276,7 +276,7 @@ ext4_xattr_block_get(struct inode *inode, int name_index, const char *name,
struct ext4_xattr_entry *entry; struct ext4_xattr_entry *entry;
size_t size; size_t size;
int error; int error;
struct mb2_cache *ext4_mb_cache = EXT4_GET_MB_CACHE(inode); struct mb_cache *ext4_mb_cache = EXT4_GET_MB_CACHE(inode);
ea_idebug(inode, "name=%d.%s, buffer=%p, buffer_size=%ld", ea_idebug(inode, "name=%d.%s, buffer=%p, buffer_size=%ld",
name_index, name, buffer, (long)buffer_size); name_index, name, buffer, (long)buffer_size);
...@@ -428,7 +428,7 @@ ext4_xattr_block_list(struct dentry *dentry, char *buffer, size_t buffer_size) ...@@ -428,7 +428,7 @@ ext4_xattr_block_list(struct dentry *dentry, char *buffer, size_t buffer_size)
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
struct buffer_head *bh = NULL; struct buffer_head *bh = NULL;
int error; int error;
struct mb2_cache *ext4_mb_cache = EXT4_GET_MB_CACHE(inode); struct mb_cache *ext4_mb_cache = EXT4_GET_MB_CACHE(inode);
ea_idebug(inode, "buffer=%p, buffer_size=%ld", ea_idebug(inode, "buffer=%p, buffer_size=%ld",
buffer, (long)buffer_size); buffer, (long)buffer_size);
...@@ -561,7 +561,7 @@ ext4_xattr_release_block(handle_t *handle, struct inode *inode, ...@@ -561,7 +561,7 @@ ext4_xattr_release_block(handle_t *handle, struct inode *inode,
* This must happen under buffer lock for * This must happen under buffer lock for
* ext4_xattr_block_set() to reliably detect freed block * ext4_xattr_block_set() to reliably detect freed block
*/ */
mb2_cache_entry_delete_block(EXT4_GET_MB_CACHE(inode), hash, mb_cache_entry_delete_block(EXT4_GET_MB_CACHE(inode), hash,
bh->b_blocknr); bh->b_blocknr);
get_bh(bh); get_bh(bh);
unlock_buffer(bh); unlock_buffer(bh);
...@@ -782,9 +782,9 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode, ...@@ -782,9 +782,9 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode,
struct super_block *sb = inode->i_sb; struct super_block *sb = inode->i_sb;
struct buffer_head *new_bh = NULL; struct buffer_head *new_bh = NULL;
struct ext4_xattr_search *s = &bs->s; struct ext4_xattr_search *s = &bs->s;
struct mb2_cache_entry *ce = NULL; struct mb_cache_entry *ce = NULL;
int error = 0; int error = 0;
struct mb2_cache *ext4_mb_cache = EXT4_GET_MB_CACHE(inode); struct mb_cache *ext4_mb_cache = EXT4_GET_MB_CACHE(inode);
#define header(x) ((struct ext4_xattr_header *)(x)) #define header(x) ((struct ext4_xattr_header *)(x))
...@@ -805,7 +805,7 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode, ...@@ -805,7 +805,7 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode,
* ext4_xattr_block_set() to reliably detect modified * ext4_xattr_block_set() to reliably detect modified
* block * block
*/ */
mb2_cache_entry_delete_block(ext4_mb_cache, hash, mb_cache_entry_delete_block(ext4_mb_cache, hash,
bs->bh->b_blocknr); bs->bh->b_blocknr);
ea_bdebug(bs->bh, "modifying in-place"); ea_bdebug(bs->bh, "modifying in-place");
error = ext4_xattr_set_entry(i, s); error = ext4_xattr_set_entry(i, s);
...@@ -904,7 +904,7 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode, ...@@ -904,7 +904,7 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode,
EXT4_C2B(EXT4_SB(sb), EXT4_C2B(EXT4_SB(sb),
1)); 1));
brelse(new_bh); brelse(new_bh);
mb2_cache_entry_put(ext4_mb_cache, ce); mb_cache_entry_put(ext4_mb_cache, ce);
ce = NULL; ce = NULL;
new_bh = NULL; new_bh = NULL;
goto inserted; goto inserted;
...@@ -919,8 +919,8 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode, ...@@ -919,8 +919,8 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode,
if (error) if (error)
goto cleanup_dquot; goto cleanup_dquot;
} }
mb2_cache_entry_touch(ext4_mb_cache, ce); mb_cache_entry_touch(ext4_mb_cache, ce);
mb2_cache_entry_put(ext4_mb_cache, ce); mb_cache_entry_put(ext4_mb_cache, ce);
ce = NULL; ce = NULL;
} else if (bs->bh && s->base == bs->bh->b_data) { } else if (bs->bh && s->base == bs->bh->b_data) {
/* We were modifying this block in-place. */ /* We were modifying this block in-place. */
...@@ -985,7 +985,7 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode, ...@@ -985,7 +985,7 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode,
cleanup: cleanup:
if (ce) if (ce)
mb2_cache_entry_put(ext4_mb_cache, ce); mb_cache_entry_put(ext4_mb_cache, ce);
brelse(new_bh); brelse(new_bh);
if (!(bs->bh && s->base == bs->bh->b_data)) if (!(bs->bh && s->base == bs->bh->b_data))
kfree(s->base); kfree(s->base);
...@@ -1546,12 +1546,12 @@ ext4_xattr_delete_inode(handle_t *handle, struct inode *inode) ...@@ -1546,12 +1546,12 @@ ext4_xattr_delete_inode(handle_t *handle, struct inode *inode)
* Returns 0, or a negative error number on failure. * Returns 0, or a negative error number on failure.
*/ */
static void static void
ext4_xattr_cache_insert(struct mb2_cache *ext4_mb_cache, struct buffer_head *bh) ext4_xattr_cache_insert(struct mb_cache *ext4_mb_cache, struct buffer_head *bh)
{ {
__u32 hash = le32_to_cpu(BHDR(bh)->h_hash); __u32 hash = le32_to_cpu(BHDR(bh)->h_hash);
int error; int error;
error = mb2_cache_entry_create(ext4_mb_cache, GFP_NOFS, hash, error = mb_cache_entry_create(ext4_mb_cache, GFP_NOFS, hash,
bh->b_blocknr); bh->b_blocknr);
if (error) { if (error) {
if (error == -EBUSY) if (error == -EBUSY)
...@@ -1610,16 +1610,16 @@ ext4_xattr_cmp(struct ext4_xattr_header *header1, ...@@ -1610,16 +1610,16 @@ ext4_xattr_cmp(struct ext4_xattr_header *header1,
*/ */
static struct buffer_head * static struct buffer_head *
ext4_xattr_cache_find(struct inode *inode, struct ext4_xattr_header *header, ext4_xattr_cache_find(struct inode *inode, struct ext4_xattr_header *header,
struct mb2_cache_entry **pce) struct mb_cache_entry **pce)
{ {
__u32 hash = le32_to_cpu(header->h_hash); __u32 hash = le32_to_cpu(header->h_hash);
struct mb2_cache_entry *ce; struct mb_cache_entry *ce;
struct mb2_cache *ext4_mb_cache = EXT4_GET_MB_CACHE(inode); struct mb_cache *ext4_mb_cache = EXT4_GET_MB_CACHE(inode);
if (!header->h_hash) if (!header->h_hash)
return NULL; /* never share */ return NULL; /* never share */
ea_idebug(inode, "looking for cached blocks [%x]", (int)hash); ea_idebug(inode, "looking for cached blocks [%x]", (int)hash);
ce = mb2_cache_entry_find_first(ext4_mb_cache, hash); ce = mb_cache_entry_find_first(ext4_mb_cache, hash);
while (ce) { while (ce) {
struct buffer_head *bh; struct buffer_head *bh;
...@@ -1638,7 +1638,7 @@ ext4_xattr_cache_find(struct inode *inode, struct ext4_xattr_header *header, ...@@ -1638,7 +1638,7 @@ ext4_xattr_cache_find(struct inode *inode, struct ext4_xattr_header *header,
return bh; return bh;
} }
brelse(bh); brelse(bh);
ce = mb2_cache_entry_find_next(ext4_mb_cache, ce); ce = mb_cache_entry_find_next(ext4_mb_cache, ce);
} }
return NULL; return NULL;
} }
...@@ -1713,15 +1713,15 @@ static void ext4_xattr_rehash(struct ext4_xattr_header *header, ...@@ -1713,15 +1713,15 @@ static void ext4_xattr_rehash(struct ext4_xattr_header *header,
#define HASH_BUCKET_BITS 10 #define HASH_BUCKET_BITS 10
struct mb2_cache * struct mb_cache *
ext4_xattr_create_cache(void) ext4_xattr_create_cache(void)
{ {
return mb2_cache_create(HASH_BUCKET_BITS); return mb_cache_create(HASH_BUCKET_BITS);
} }
void ext4_xattr_destroy_cache(struct mb2_cache *cache) void ext4_xattr_destroy_cache(struct mb_cache *cache)
{ {
if (cache) if (cache)
mb2_cache_destroy(cache); mb_cache_destroy(cache);
} }
fs/ext4/xattr.h
View file @ 7a2508e1
...@@ -123,8 +123,8 @@ extern int ext4_xattr_ibody_inline_set(handle_t *handle, struct inode *inode, ...@@ -123,8 +123,8 @@ extern int ext4_xattr_ibody_inline_set(handle_t *handle, struct inode *inode,
struct ext4_xattr_info *i, struct ext4_xattr_info *i,
struct ext4_xattr_ibody_find *is); struct ext4_xattr_ibody_find *is);
extern struct mb2_cache *ext4_xattr_create_cache(void); extern struct mb_cache *ext4_xattr_create_cache(void);
extern void ext4_xattr_destroy_cache(struct mb2_cache *); extern void ext4_xattr_destroy_cache(struct mb_cache *);
#ifdef CONFIG_EXT4_FS_SECURITY #ifdef CONFIG_EXT4_FS_SECURITY
extern int ext4_init_security(handle_t *handle, struct inode *inode, extern int ext4_init_security(handle_t *handle, struct inode *inode,
......
fs/mbcache2.c → fs/mbcache.c
View file @ 7a2508e1
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/mbcache2.h> #include <linux/mbcache.h>
/* /*
* Mbcache is a simple key-value store. Keys need not be unique, however * Mbcache is a simple key-value store. Keys need not be unique, however
* key-value pairs are expected to be unique (we use this fact in * key-value pairs are expected to be unique (we use this fact in
* mb2_cache_entry_delete_block()). * mb_cache_entry_delete_block()).
* *
* Ext2 and ext4 use this cache for deduplication of extended attribute blocks. * Ext2 and ext4 use this cache for deduplication of extended attribute blocks.
* They use hash of a block contents as a key and block number as a value. * They use hash of a block contents as a key and block number as a value.
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
* size hash table is used for fast key lookups. * size hash table is used for fast key lookups.
*/ */
struct mb2_cache { struct mb_cache {
/* Hash table of entries */ /* Hash table of entries */
struct hlist_bl_head *c_hash; struct hlist_bl_head *c_hash;
/* log2 of hash table size */ /* log2 of hash table size */
...@@ -40,29 +40,29 @@ struct mb2_cache { ...@@ -40,29 +40,29 @@ struct mb2_cache {
struct work_struct c_shrink_work; struct work_struct c_shrink_work;
}; };
static struct kmem_cache *mb2_entry_cache; static struct kmem_cache *mb_entry_cache;
static unsigned long mb2_cache_shrink(struct mb2_cache *cache, static unsigned long mb_cache_shrink(struct mb_cache *cache,
unsigned int nr_to_scan); unsigned int nr_to_scan);
static inline bool mb2_cache_entry_referenced(struct mb2_cache_entry *entry) static inline bool mb_cache_entry_referenced(struct mb_cache_entry *entry)
{ {
return entry->_e_hash_list_head & 1; return entry->_e_hash_list_head & 1;
} }
static inline void mb2_cache_entry_set_referenced(struct mb2_cache_entry *entry) static inline void mb_cache_entry_set_referenced(struct mb_cache_entry *entry)
{ {
entry->_e_hash_list_head |= 1; entry->_e_hash_list_head |= 1;
} }
static inline void mb2_cache_entry_clear_referenced( static inline void mb_cache_entry_clear_referenced(
struct mb2_cache_entry *entry) struct mb_cache_entry *entry)
{ {
entry->_e_hash_list_head &= ~1; entry->_e_hash_list_head &= ~1;
} }
static inline struct hlist_bl_head *mb2_cache_entry_head( static inline struct hlist_bl_head *mb_cache_entry_head(
struct mb2_cache_entry *entry) struct mb_cache_entry *entry)
{ {
return (struct hlist_bl_head *) return (struct hlist_bl_head *)
(entry->_e_hash_list_head & ~1); (entry->_e_hash_list_head & ~1);
...@@ -75,7 +75,7 @@ static inline struct hlist_bl_head *mb2_cache_entry_head( ...@@ -75,7 +75,7 @@ static inline struct hlist_bl_head *mb2_cache_entry_head(
#define SYNC_SHRINK_BATCH 64 #define SYNC_SHRINK_BATCH 64
/* /*
* mb2_cache_entry_create - create entry in cache * mb_cache_entry_create - create entry in cache
* @cache - cache where the entry should be created * @cache - cache where the entry should be created
* @mask - gfp mask with which the entry should be allocated * @mask - gfp mask with which the entry should be allocated
* @key - key of the entry * @key - key of the entry
...@@ -85,10 +85,10 @@ static inline struct hlist_bl_head *mb2_cache_entry_head( ...@@ -85,10 +85,10 @@ static inline struct hlist_bl_head *mb2_cache_entry_head(
* block @block. The function returns -EBUSY if entry with the same key * block @block. The function returns -EBUSY if entry with the same key
* and for the same block already exists in cache. Otherwise 0 is returned. * and for the same block already exists in cache. Otherwise 0 is returned.
*/ */
int mb2_cache_entry_create(struct mb2_cache *cache, gfp_t mask, u32 key, int mb_cache_entry_create(struct mb_cache *cache, gfp_t mask, u32 key,
sector_t block) sector_t block)
{ {
struct mb2_cache_entry *entry, *dup; struct mb_cache_entry *entry, *dup;
struct hlist_bl_node *dup_node; struct hlist_bl_node *dup_node;
struct hlist_bl_head *head; struct hlist_bl_head *head;
...@@ -97,9 +97,9 @@ int mb2_cache_entry_create(struct mb2_cache *cache, gfp_t mask, u32 key, ...@@ -97,9 +97,9 @@ int mb2_cache_entry_create(struct mb2_cache *cache, gfp_t mask, u32 key,
schedule_work(&cache->c_shrink_work); schedule_work(&cache->c_shrink_work);
/* Do some sync reclaim if background reclaim cannot keep up */ /* Do some sync reclaim if background reclaim cannot keep up */
if (cache->c_entry_count >= 2*cache->c_max_entries) if (cache->c_entry_count >= 2*cache->c_max_entries)
mb2_cache_shrink(cache, SYNC_SHRINK_BATCH); mb_cache_shrink(cache, SYNC_SHRINK_BATCH);
entry = kmem_cache_alloc(mb2_entry_cache, mask); entry = kmem_cache_alloc(mb_entry_cache, mask);
if (!entry) if (!entry)
return -ENOMEM; return -ENOMEM;
...@@ -114,7 +114,7 @@ int mb2_cache_entry_create(struct mb2_cache *cache, gfp_t mask, u32 key, ...@@ -114,7 +114,7 @@ int mb2_cache_entry_create(struct mb2_cache *cache, gfp_t mask, u32 key,
hlist_bl_for_each_entry(dup, dup_node, head, e_hash_list) { hlist_bl_for_each_entry(dup, dup_node, head, e_hash_list) {
if (dup->e_key == key && dup->e_block == block) { if (dup->e_key == key && dup->e_block == block) {
hlist_bl_unlock(head); hlist_bl_unlock(head);
kmem_cache_free(mb2_entry_cache, entry); kmem_cache_free(mb_entry_cache, entry);
return -EBUSY; return -EBUSY;
} }
} }
...@@ -130,24 +130,24 @@ int mb2_cache_entry_create(struct mb2_cache *cache, gfp_t mask, u32 key, ...@@ -130,24 +130,24 @@ int mb2_cache_entry_create(struct mb2_cache *cache, gfp_t mask, u32 key,
return 0; return 0;
} }
EXPORT_SYMBOL(mb2_cache_entry_create); EXPORT_SYMBOL(mb_cache_entry_create);
void __mb2_cache_entry_free(struct mb2_cache_entry *entry) void __mb_cache_entry_free(struct mb_cache_entry *entry)
{ {
kmem_cache_free(mb2_entry_cache, entry); kmem_cache_free(mb_entry_cache, entry);
} }
EXPORT_SYMBOL(__mb2_cache_entry_free); EXPORT_SYMBOL(__mb_cache_entry_free);
static struct mb2_cache_entry *__entry_find(struct mb2_cache *cache, static struct mb_cache_entry *__entry_find(struct mb_cache *cache,
struct mb2_cache_entry *entry, struct mb_cache_entry *entry,
u32 key) u32 key)
{ {
struct mb2_cache_entry *old_entry = entry; struct mb_cache_entry *old_entry = entry;
struct hlist_bl_node *node; struct hlist_bl_node *node;
struct hlist_bl_head *head; struct hlist_bl_head *head;
if (entry) if (entry)
head = mb2_cache_entry_head(entry); head = mb_cache_entry_head(entry);
else else
head = &cache->c_hash[hash_32(key, cache->c_bucket_bits)]; head = &cache->c_hash[hash_32(key, cache->c_bucket_bits)];
hlist_bl_lock(head); hlist_bl_lock(head);
...@@ -156,7 +156,7 @@ static struct mb2_cache_entry *__entry_find(struct mb2_cache *cache, ...@@ -156,7 +156,7 @@ static struct mb2_cache_entry *__entry_find(struct mb2_cache *cache,
else else
node = hlist_bl_first(head); node = hlist_bl_first(head);
while (node) { while (node) {
entry = hlist_bl_entry(node, struct mb2_cache_entry, entry = hlist_bl_entry(node, struct mb_cache_entry,
e_hash_list); e_hash_list);
if (entry->e_key == key) { if (entry->e_key == key) {
atomic_inc(&entry->e_refcnt); atomic_inc(&entry->e_refcnt);
...@@ -168,28 +168,28 @@ static struct mb2_cache_entry *__entry_find(struct mb2_cache *cache, ...@@ -168,28 +168,28 @@ static struct mb2_cache_entry *__entry_find(struct mb2_cache *cache,
out: out:
hlist_bl_unlock(head); hlist_bl_unlock(head);
if (old_entry) if (old_entry)
mb2_cache_entry_put(cache, old_entry); mb_cache_entry_put(cache, old_entry);
return entry; return entry;
} }
/* /*
* mb2_cache_entry_find_first - find the first entry in cache with given key * mb_cache_entry_find_first - find the first entry in cache with given key
* @cache: cache where we should search * @cache: cache where we should search
* @key: key to look for * @key: key to look for
* *
* Search in @cache for entry with key @key. Grabs reference to the first * Search in @cache for entry with key @key. Grabs reference to the first
* entry found and returns the entry. * entry found and returns the entry.
*/ */
struct mb2_cache_entry *mb2_cache_entry_find_first(struct mb2_cache *cache, struct mb_cache_entry *mb_cache_entry_find_first(struct mb_cache *cache,
u32 key) u32 key)
{ {
return __entry_find(cache, NULL, key); return __entry_find(cache, NULL, key);
} }
EXPORT_SYMBOL(mb2_cache_entry_find_first); EXPORT_SYMBOL(mb_cache_entry_find_first);
/* /*
* mb2_cache_entry_find_next - find next entry in cache with the same * mb_cache_entry_find_next - find next entry in cache with the same
* @cache: cache where we should search * @cache: cache where we should search
* @entry: entry to start search from * @entry: entry to start search from
* *
...@@ -198,26 +198,26 @@ EXPORT_SYMBOL(mb2_cache_entry_find_first); ...@@ -198,26 +198,26 @@ EXPORT_SYMBOL(mb2_cache_entry_find_first);
* with the search), finds the first entry in the hash chain. The function * with the search), finds the first entry in the hash chain. The function
* drops reference to @entry and returns with a reference to the found entry. * drops reference to @entry and returns with a reference to the found entry.
*/ */
struct mb2_cache_entry *mb2_cache_entry_find_next(struct mb2_cache *cache, struct mb_cache_entry *mb_cache_entry_find_next(struct mb_cache *cache,
struct mb2_cache_entry *entry) struct mb_cache_entry *entry)
{ {
return __entry_find(cache, entry, entry->e_key); return __entry_find(cache, entry, entry->e_key);
} }
EXPORT_SYMBOL(mb2_cache_entry_find_next); EXPORT_SYMBOL(mb_cache_entry_find_next);
/* mb2_cache_entry_delete_block - remove information about block from cache /* mb_cache_entry_delete_block - remove information about block from cache
* @cache - cache we work with * @cache - cache we work with
* @key - key of the entry to remove * @key - key of the entry to remove
* @block - block containing data for @key * @block - block containing data for @key
* *
* Remove entry from cache @cache with key @key with data stored in @block. * Remove entry from cache @cache with key @key with data stored in @block.
*/ */
void mb2_cache_entry_delete_block(struct mb2_cache *cache, u32 key, void mb_cache_entry_delete_block(struct mb_cache *cache, u32 key,
sector_t block) sector_t block)
{ {
struct hlist_bl_node *node; struct hlist_bl_node *node;
struct hlist_bl_head *head; struct hlist_bl_head *head;
struct mb2_cache_entry *entry; struct mb_cache_entry *entry;
head = &cache->c_hash[hash_32(key, cache->c_bucket_bits)]; head = &cache->c_hash[hash_32(key, cache->c_bucket_bits)];
hlist_bl_lock(head); hlist_bl_lock(head);
...@@ -233,50 +233,50 @@ void mb2_cache_entry_delete_block(struct mb2_cache *cache, u32 key, ...@@ -233,50 +233,50 @@ void mb2_cache_entry_delete_block(struct mb2_cache *cache, u32 key,
atomic_dec(&entry->e_refcnt); atomic_dec(&entry->e_refcnt);
} }
spin_unlock(&cache->c_list_lock); spin_unlock(&cache->c_list_lock);
mb2_cache_entry_put(cache, entry); mb_cache_entry_put(cache, entry);
return; return;
} }
} }
hlist_bl_unlock(head); hlist_bl_unlock(head);
} }
EXPORT_SYMBOL(mb2_cache_entry_delete_block); EXPORT_SYMBOL(mb_cache_entry_delete_block);
/* mb2_cache_entry_touch - cache entry got used /* mb_cache_entry_touch - cache entry got used
* @cache - cache the entry belongs to * @cache - cache the entry belongs to
* @entry - entry that got used * @entry - entry that got used
* *
* Marks entry as used to give hit higher chances of surviving in cache. * Marks entry as used to give hit higher chances of surviving in cache.
*/ */
void mb2_cache_entry_touch(struct mb2_cache *cache, void mb_cache_entry_touch(struct mb_cache *cache,
struct mb2_cache_entry *entry) struct mb_cache_entry *entry)
{ {
mb2_cache_entry_set_referenced(entry); mb_cache_entry_set_referenced(entry);
} }
EXPORT_SYMBOL(mb2_cache_entry_touch); EXPORT_SYMBOL(mb_cache_entry_touch);
static unsigned long mb2_cache_count(struct shrinker *shrink, static unsigned long mb_cache_count(struct shrinker *shrink,
struct shrink_control *sc) struct shrink_control *sc)
{ {
struct mb2_cache *cache = container_of(shrink, struct mb2_cache, struct mb_cache *cache = container_of(shrink, struct mb_cache,
c_shrink); c_shrink);
return cache->c_entry_count; return cache->c_entry_count;
} }
/* Shrink number of entries in cache */ /* Shrink number of entries in cache */
static unsigned long mb2_cache_shrink(struct mb2_cache *cache, static unsigned long mb_cache_shrink(struct mb_cache *cache,
unsigned int nr_to_scan) unsigned int nr_to_scan)
{ {
struct mb2_cache_entry *entry; struct mb_cache_entry *entry;
struct hlist_bl_head *head; struct hlist_bl_head *head;
unsigned int shrunk = 0; unsigned int shrunk = 0;
spin_lock(&cache->c_list_lock); spin_lock(&cache->c_list_lock);
while (nr_to_scan-- && !list_empty(&cache->c_list)) { while (nr_to_scan-- && !list_empty(&cache->c_list)) {
entry = list_first_entry(&cache->c_list, entry = list_first_entry(&cache->c_list,
struct mb2_cache_entry, e_list); struct mb_cache_entry, e_list);
if (mb2_cache_entry_referenced(entry)) { if (mb_cache_entry_referenced(entry)) {
mb2_cache_entry_clear_referenced(entry); mb_cache_entry_clear_referenced(entry);
list_move_tail(&cache->c_list, &entry->e_list); list_move_tail(&cache->c_list, &entry->e_list);
continue; continue;
} }
...@@ -287,14 +287,14 @@ static unsigned long mb2_cache_shrink(struct mb2_cache *cache, ...@@ -287,14 +287,14 @@ static unsigned long mb2_cache_shrink(struct mb2_cache *cache,
* from under us. * from under us.
*/ */
spin_unlock(&cache->c_list_lock); spin_unlock(&cache->c_list_lock);
head = mb2_cache_entry_head(entry); head = mb_cache_entry_head(entry);
hlist_bl_lock(head); hlist_bl_lock(head);
if (!hlist_bl_unhashed(&entry->e_hash_list)) { if (!hlist_bl_unhashed(&entry->e_hash_list)) {
hlist_bl_del_init(&entry->e_hash_list); hlist_bl_del_init(&entry->e_hash_list);
atomic_dec(&entry->e_refcnt); atomic_dec(&entry->e_refcnt);
} }
hlist_bl_unlock(head); hlist_bl_unlock(head);
if (mb2_cache_entry_put(cache, entry)) if (mb_cache_entry_put(cache, entry))
shrunk++; shrunk++;
cond_resched(); cond_resched();
spin_lock(&cache->c_list_lock); spin_lock(&cache->c_list_lock);
...@@ -304,41 +304,41 @@ static unsigned long mb2_cache_shrink(struct mb2_cache *cache, ...@@ -304,41 +304,41 @@ static unsigned long mb2_cache_shrink(struct mb2_cache *cache,
return shrunk; return shrunk;
} }
static unsigned long mb2_cache_scan(struct shrinker *shrink, static unsigned long mb_cache_scan(struct shrinker *shrink,
struct shrink_control *sc) struct shrink_control *sc)
{ {
int nr_to_scan = sc->nr_to_scan; int nr_to_scan = sc->nr_to_scan;
struct mb2_cache *cache = container_of(shrink, struct mb2_cache, struct mb_cache *cache = container_of(shrink, struct mb_cache,
c_shrink); c_shrink);
return mb2_cache_shrink(cache, nr_to_scan); return mb_cache_shrink(cache, nr_to_scan);
} }
/* We shrink 1/X of the cache when we have too many entries in it */ /* We shrink 1/X of the cache when we have too many entries in it */
#define SHRINK_DIVISOR 16 #define SHRINK_DIVISOR 16
static void mb2_cache_shrink_worker(struct work_struct *work) static void mb_cache_shrink_worker(struct work_struct *work)
{ {
struct mb2_cache *cache = container_of(work, struct mb2_cache, struct mb_cache *cache = container_of(work, struct mb_cache,
c_shrink_work); c_shrink_work);
mb2_cache_shrink(cache, cache->c_max_entries / SHRINK_DIVISOR); mb_cache_shrink(cache, cache->c_max_entries / SHRINK_DIVISOR);
} }
/* /*
* mb2_cache_create - create cache * mb_cache_create - create cache
* @bucket_bits: log2 of the hash table size * @bucket_bits: log2 of the hash table size
* *
* Create cache for keys with 2^bucket_bits hash entries. * Create cache for keys with 2^bucket_bits hash entries.
*/ */
struct mb2_cache *mb2_cache_create(int bucket_bits) struct mb_cache *mb_cache_create(int bucket_bits)
{ {
struct mb2_cache *cache; struct mb_cache *cache;
int bucket_count = 1 << bucket_bits; int bucket_count = 1 << bucket_bits;
int i; int i;
if (!try_module_get(THIS_MODULE)) if (!try_module_get(THIS_MODULE))
return NULL; return NULL;
cache = kzalloc(sizeof(struct mb2_cache), GFP_KERNEL); cache = kzalloc(sizeof(struct mb_cache), GFP_KERNEL);
if (!cache) if (!cache)
goto err_out; goto err_out;
cache->c_bucket_bits = bucket_bits; cache->c_bucket_bits = bucket_bits;
...@@ -354,12 +354,12 @@ struct mb2_cache *mb2_cache_create(int bucket_bits) ...@@ -354,12 +354,12 @@ struct mb2_cache *mb2_cache_create(int bucket_bits)
for (i = 0; i < bucket_count; i++) for (i = 0; i < bucket_count; i++)
INIT_HLIST_BL_HEAD(&cache->c_hash[i]); INIT_HLIST_BL_HEAD(&cache->c_hash[i]);
cache->c_shrink.count_objects = mb2_cache_count; cache->c_shrink.count_objects = mb_cache_count;
cache->c_shrink.scan_objects = mb2_cache_scan; cache->c_shrink.scan_objects = mb_cache_scan;
cache->c_shrink.seeks = DEFAULT_SEEKS; cache->c_shrink.seeks = DEFAULT_SEEKS;
register_shrinker(&cache->c_shrink); register_shrinker(&cache->c_shrink);
INIT_WORK(&cache->c_shrink_work, mb2_cache_shrink_worker); INIT_WORK(&cache->c_shrink_work, mb_cache_shrink_worker);
return cache; return cache;
...@@ -367,18 +367,18 @@ struct mb2_cache *mb2_cache_create(int bucket_bits) ...@@ -367,18 +367,18 @@ struct mb2_cache *mb2_cache_create(int bucket_bits)
module_put(THIS_MODULE); module_put(THIS_MODULE);
return NULL; return NULL;
} }
EXPORT_SYMBOL(mb2_cache_create); EXPORT_SYMBOL(mb_cache_create);
/* /*
* mb2_cache_destroy - destroy cache * mb_cache_destroy - destroy cache
* @cache: the cache to destroy * @cache: the cache to destroy
* *
* Free all entries in cache and cache itself. Caller must make sure nobody * Free all entries in cache and cache itself. Caller must make sure nobody
* (except shrinker) can reach @cache when calling this. * (except shrinker) can reach @cache when calling this.
*/ */
void mb2_cache_destroy(struct mb2_cache *cache) void mb_cache_destroy(struct mb_cache *cache)
{ {
struct mb2_cache_entry *entry, *next; struct mb_cache_entry *entry, *next;
unregister_shrinker(&cache->c_shrink); unregister_shrinker(&cache->c_shrink);
...@@ -394,30 +394,30 @@ void mb2_cache_destroy(struct mb2_cache *cache) ...@@ -394,30 +394,30 @@ void mb2_cache_destroy(struct mb2_cache *cache)
WARN_ON(1); WARN_ON(1);
list_del(&entry->e_list); list_del(&entry->e_list);
WARN_ON(atomic_read(&entry->e_refcnt) != 1); WARN_ON(atomic_read(&entry->e_refcnt) != 1);
mb2_cache_entry_put(cache, entry); mb_cache_entry_put(cache, entry);
} }
kfree(cache->c_hash); kfree(cache->c_hash);
kfree(cache); kfree(cache);
module_put(THIS_MODULE); module_put(THIS_MODULE);
} }
EXPORT_SYMBOL(mb2_cache_destroy); EXPORT_SYMBOL(mb_cache_destroy);
static int __init mb2cache_init(void) static int __init mbcache_init(void)
{ {
mb2_entry_cache = kmem_cache_create("mbcache", mb_entry_cache = kmem_cache_create("mbcache",
sizeof(struct mb2_cache_entry), 0, sizeof(struct mb_cache_entry), 0,
SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, NULL); SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, NULL);
BUG_ON(!mb2_entry_cache); BUG_ON(!mb_entry_cache);
return 0; return 0;
} }
static void __exit mb2cache_exit(void) static void __exit mbcache_exit(void)
{ {
kmem_cache_destroy(mb2_entry_cache); kmem_cache_destroy(mb_entry_cache);
} }
module_init(mb2cache_init) module_init(mbcache_init)
module_exit(mb2cache_exit) module_exit(mbcache_exit)
MODULE_AUTHOR("Jan Kara <jack@suse.cz>"); MODULE_AUTHOR("Jan Kara <jack@suse.cz>");
MODULE_DESCRIPTION("Meta block cache (for extended attributes)"); MODULE_DESCRIPTION("Meta block cache (for extended attributes)");
......
include/linux/mbcache2.h → include/linux/mbcache.h
View file @ 7a2508e1
#ifndef _LINUX_MB2CACHE_H #ifndef _LINUX_MBCACHE_H
#define _LINUX_MB2CACHE_H #define _LINUX_MBCACHE_H
#include <linux/hash.h> #include <linux/hash.h>
#include <linux/list_bl.h> #include <linux/list_bl.h>
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
#include <linux/atomic.h> #include <linux/atomic.h>
#include <linux/fs.h> #include <linux/fs.h>
struct mb2_cache; struct mb_cache;
struct mb2_cache_entry { struct mb_cache_entry {
/* List of entries in cache - protected by cache->c_list_lock */ /* List of entries in cache - protected by cache->c_list_lock */
struct list_head e_list; struct list_head e_list;
/* Hash table list - protected by bitlock in e_hash_list_head */ /* Hash table list - protected by bitlock in e_hash_list_head */
...@@ -26,28 +26,28 @@ struct mb2_cache_entry { ...@@ -26,28 +26,28 @@ struct mb2_cache_entry {
unsigned long _e_hash_list_head; unsigned long _e_hash_list_head;
}; };
struct mb2_cache *mb2_cache_create(int bucket_bits); struct mb_cache *mb_cache_create(int bucket_bits);
void mb2_cache_destroy(struct mb2_cache *cache); void mb_cache_destroy(struct mb_cache *cache);
int mb2_cache_entry_create(struct mb2_cache *cache, gfp_t mask, u32 key, int mb_cache_entry_create(struct mb_cache *cache, gfp_t mask, u32 key,
sector_t block); sector_t block);
void __mb2_cache_entry_free(struct mb2_cache_entry *entry); void __mb_cache_entry_free(struct mb_cache_entry *entry);
static inline int mb2_cache_entry_put(struct mb2_cache *cache, static inline int mb_cache_entry_put(struct mb_cache *cache,
struct mb2_cache_entry *entry) struct mb_cache_entry *entry)
{ {
if (!atomic_dec_and_test(&entry->e_refcnt)) if (!atomic_dec_and_test(&entry->e_refcnt))
return 0; return 0;
__mb2_cache_entry_free(entry); __mb_cache_entry_free(entry);
return 1; return 1;
} }
void mb2_cache_entry_delete_block(struct mb2_cache *cache, u32 key, void mb_cache_entry_delete_block(struct mb_cache *cache, u32 key,
sector_t block); sector_t block);
struct mb2_cache_entry *mb2_cache_entry_find_first(struct mb2_cache *cache, struct mb_cache_entry *mb_cache_entry_find_first(struct mb_cache *cache,
u32 key); u32 key);
struct mb2_cache_entry *mb2_cache_entry_find_next(struct mb2_cache *cache, struct mb_cache_entry *mb_cache_entry_find_next(struct mb_cache *cache,
struct mb2_cache_entry *entry); struct mb_cache_entry *entry);
void mb2_cache_entry_touch(struct mb2_cache *cache, void mb_cache_entry_touch(struct mb_cache *cache,
struct mb2_cache_entry *entry); struct mb_cache_entry *entry);
#endif /* _LINUX_MB2CACHE_H */ #endif /* _LINUX_MBCACHE_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7