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

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

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

fs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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_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_NFS_COMMON)	+= nfs_common/

obj-$(CONFIG_COREDUMP)		+= coredump.o

fs/ext2/ext2.h

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ struct ext2_block_alloc_info { 
#define rsv_start rsv_window._rsv_start

#define rsv_end rsv_window._rsv_end



struct mb2_cache;

struct mb_cache;



/*

 * second extended-fs super-block data in memory
@@ -113,7 +113,7 @@ struct ext2_sb_info { 
	 * of the mount options.

	 */

	spinlock_t s_lock;

	struct mb2_cache *s_mb_cache;

	struct mb_cache *s_mb_cache;

};



static inline spinlock_t *

fs/ext2/xattr.c

+24 −24
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 
#include <linux/buffer_head.h>

#include <linux/init.h>

#include <linux/slab.h>

#include <linux/mbcache2.h>

#include <linux/mbcache.h>

#include <linux/quotaops.h>

#include <linux/rwsem.h>

#include <linux/security.h>
@@ -90,7 +90,7 @@ 
static int ext2_xattr_set2(struct inode *, struct buffer_head *,

			   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 *,

						 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, 
	size_t name_len, size;

	char *end;

	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",

		  name_index, name, buffer, (long)buffer_size);
@@ -246,7 +246,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size) 
	char *end;

	size_t rest = buffer_size;

	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",

		  buffer, (long)buffer_size);
@@ -493,7 +493,7 @@ bad_block: ext2_error(sb, "ext2_xattr_set", 
			 * This must happen under buffer lock for

			 * 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);



			/* keep the buffer locked while modifying it. */
@@ -627,7 +627,7 @@ ext2_xattr_set2(struct inode *inode, struct buffer_head *old_bh, 
	struct super_block *sb = inode->i_sb;

	struct buffer_head *new_bh = NULL;

	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) {

		new_bh = ext2_xattr_cache_find(inode, header);
@@ -721,7 +721,7 @@ ext2_xattr_set2(struct inode *inode, struct buffer_head *old_bh, 
			 * This must happen under buffer lock for

			 * 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);

			/* Free the old block. */

			ea_bdebug(old_bh, "freeing");
@@ -786,7 +786,7 @@ ext2_xattr_delete_inode(struct inode *inode) 
		 * This must happen under buffer lock for ext2_xattr_set2() to

		 * 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);

		ext2_free_blocks(inode, EXT2_I(inode)->i_file_acl, 1);

		get_bh(bh);
@@ -818,12 +818,12 @@ ext2_xattr_delete_inode(struct inode *inode) 
 * Returns 0, or a negative error number on failure.

 */

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);

	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 == -EBUSY) {

			ea_bdebug(bh, "already in cache (%d cache entries)",
@@ -887,14 +887,14 @@ static struct buffer_head * 
ext2_xattr_cache_find(struct inode *inode, struct ext2_xattr_header *header)

{

	__u32 hash = le32_to_cpu(header->h_hash);

	struct mb2_cache_entry *ce;

	struct mb2_cache *ext2_mb_cache = EXT2_SB(inode->i_sb)->s_mb_cache;

	struct mb_cache_entry *ce;

	struct mb_cache *ext2_mb_cache = EXT2_SB(inode->i_sb)->s_mb_cache;



	if (!header->h_hash)

		return NULL;  /* never share */

	ea_idebug(inode, "looking for cached blocks [%x]", (int)hash);

again:

	ce = mb2_cache_entry_find_first(ext2_mb_cache, hash);

	ce = mb_cache_entry_find_first(ext2_mb_cache, hash);

	while (ce) {

		struct buffer_head *bh;
@@ -915,7 +915,7 @@ ext2_xattr_cache_find(struct inode *inode, struct ext2_xattr_header *header) 
			 * entry is still hashed is reliable.

			 */

			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);

				brelse(bh);

				goto again;
@@ -928,14 +928,14 @@ ext2_xattr_cache_find(struct inode *inode, struct ext2_xattr_header *header) 
			} else if (!ext2_xattr_cmp(header, HDR(bh))) {

				ea_bdebug(bh, "b_count=%d",

					  atomic_read(&(bh->b_count)));

				mb2_cache_entry_touch(ext2_mb_cache, ce);

				mb2_cache_entry_put(ext2_mb_cache, ce);

				mb_cache_entry_touch(ext2_mb_cache, ce);

				mb_cache_entry_put(ext2_mb_cache, ce);

				return bh;

			}

			unlock_buffer(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;

}
@@ -1010,13 +1010,13 @@ static void ext2_xattr_rehash(struct ext2_xattr_header *header, 


#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)

		mb2_cache_destroy(cache);

		mb_cache_destroy(cache);

}

fs/ext2/xattr.h

+4 −4
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ struct ext2_xattr_entry { 
#define EXT2_XATTR_SIZE(size) \

	(((size) + EXT2_XATTR_ROUND) & ~EXT2_XATTR_ROUND)



struct mb2_cache;

struct mb_cache;



# ifdef CONFIG_EXT2_FS_XATTR
@@ -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 struct mb2_cache *ext2_xattr_create_cache(void);

extern void ext2_xattr_destroy_cache(struct mb2_cache *cache);

extern struct mb_cache *ext2_xattr_create_cache(void);

extern void ext2_xattr_destroy_cache(struct mb_cache *cache);



extern const struct xattr_handler *ext2_xattr_handlers[];
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -1468,7 +1468,7 @@ struct ext4_sb_info { 
	struct list_head s_es_list;	/* List of inodes with reclaimable extents */

	long s_es_nr_inode;

	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;



	/* Ratelimit ext4 messages. */