Commit 47387409 authored by Tahsin Erdogan's avatar Tahsin Erdogan Committed by Theodore Ts'o
Browse files

ext2, ext4: make mb block cache names more explicit 



There will be a second mb_cache instance that tracks ea_inodes. Make
existing names more explicit so that it is clear that they refer to
xattr block cache.

Signed-off-by: default avatarTahsin Erdogan <tahsin@google.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent c07dfcb4

fs/ext2/ext2.h

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ struct ext2_sb_info { 
	 * of the mount options.

	 */

	spinlock_t s_lock;

	struct mb_cache *s_mb_cache;

	struct mb_cache *s_ea_block_cache;

};



static inline spinlock_t *

fs/ext2/super.c

+8 −8
Original line number Diff line number Diff line
@@ -147,9 +147,9 @@ static void ext2_put_super (struct super_block * sb) 


	ext2_quota_off_umount(sb);



	if (sbi->s_mb_cache) {

		ext2_xattr_destroy_cache(sbi->s_mb_cache);

		sbi->s_mb_cache = NULL;

	if (sbi->s_ea_block_cache) {

		ext2_xattr_destroy_cache(sbi->s_ea_block_cache);

		sbi->s_ea_block_cache = NULL;

	}

	if (!(sb->s_flags & MS_RDONLY)) {

		struct ext2_super_block *es = sbi->s_es;
@@ -1131,9 +1131,9 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) 
	}



#ifdef CONFIG_EXT2_FS_XATTR

	sbi->s_mb_cache = ext2_xattr_create_cache();

	if (!sbi->s_mb_cache) {

		ext2_msg(sb, KERN_ERR, "Failed to create an mb_cache");

	sbi->s_ea_block_cache = ext2_xattr_create_cache();

	if (!sbi->s_ea_block_cache) {

		ext2_msg(sb, KERN_ERR, "Failed to create ea_block_cache");

		goto failed_mount3;

	}

#endif
@@ -1182,8 +1182,8 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) 
			sb->s_id);

	goto failed_mount;

failed_mount3:

	if (sbi->s_mb_cache)

		ext2_xattr_destroy_cache(sbi->s_mb_cache);

	if (sbi->s_ea_block_cache)

		ext2_xattr_destroy_cache(sbi->s_ea_block_cache);

	percpu_counter_destroy(&sbi->s_freeblocks_counter);

	percpu_counter_destroy(&sbi->s_freeinodes_counter);

	percpu_counter_destroy(&sbi->s_dirs_counter);

fs/ext2/xattr.c

+19 −17
Original line number Diff line number Diff line
@@ -121,6 +121,8 @@ const struct xattr_handler *ext2_xattr_handlers[] = { 
	NULL

};



#define EA_BLOCK_CACHE(inode)	(EXT2_SB(inode->i_sb)->s_ea_block_cache)



static inline const struct xattr_handler *

ext2_xattr_handler(int name_index)

{
@@ -150,7 +152,7 @@ ext2_xattr_get(struct inode *inode, int name_index, const char *name, 
	size_t name_len, size;

	char *end;

	int error;

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

	struct mb_cache *ea_block_cache = EA_BLOCK_CACHE(inode);



	ea_idebug(inode, "name=%d.%s, buffer=%p, buffer_size=%ld",

		  name_index, name, buffer, (long)buffer_size);
@@ -195,7 +197,7 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_get", 
			goto found;

		entry = next;

	}

	if (ext2_xattr_cache_insert(ext2_mb_cache, bh))

	if (ext2_xattr_cache_insert(ea_block_cache, bh))

		ea_idebug(inode, "cache insert failed");

	error = -ENODATA;

	goto cleanup;
@@ -208,7 +210,7 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_get", 
	    le16_to_cpu(entry->e_value_offs) + size > inode->i_sb->s_blocksize)

		goto bad_block;



	if (ext2_xattr_cache_insert(ext2_mb_cache, bh))

	if (ext2_xattr_cache_insert(ea_block_cache, bh))

		ea_idebug(inode, "cache insert failed");

	if (buffer) {

		error = -ERANGE;
@@ -246,7 +248,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size) 
	char *end;

	size_t rest = buffer_size;

	int error;

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

	struct mb_cache *ea_block_cache = EA_BLOCK_CACHE(inode);



	ea_idebug(inode, "buffer=%p, buffer_size=%ld",

		  buffer, (long)buffer_size);
@@ -281,7 +283,7 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list", 
			goto bad_block;

		entry = next;

	}

	if (ext2_xattr_cache_insert(ext2_mb_cache, bh))

	if (ext2_xattr_cache_insert(ea_block_cache, bh))

		ea_idebug(inode, "cache insert failed");



	/* list the attribute names */
@@ -493,7 +495,7 @@ bad_block: ext2_error(sb, "ext2_xattr_set", 
			 * This must happen under buffer lock for

			 * ext2_xattr_set2() to reliably detect modified block

			 */

			mb_cache_entry_delete(EXT2_SB(sb)->s_mb_cache, hash,

			mb_cache_entry_delete(EA_BLOCK_CACHE(inode), hash,

					      bh->b_blocknr);



			/* keep the buffer locked while modifying it. */
@@ -627,7 +629,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 mb_cache *ext2_mb_cache = EXT2_SB(sb)->s_mb_cache;

	struct mb_cache *ea_block_cache = EA_BLOCK_CACHE(inode);



	if (header) {

		new_bh = ext2_xattr_cache_find(inode, header);
@@ -655,7 +657,7 @@ ext2_xattr_set2(struct inode *inode, struct buffer_head *old_bh, 
			   don't need to change the reference count. */

			new_bh = old_bh;

			get_bh(new_bh);

			ext2_xattr_cache_insert(ext2_mb_cache, new_bh);

			ext2_xattr_cache_insert(ea_block_cache, new_bh);

		} else {

			/* We need to allocate a new block */

			ext2_fsblk_t goal = ext2_group_first_block_no(sb,
@@ -676,7 +678,7 @@ ext2_xattr_set2(struct inode *inode, struct buffer_head *old_bh, 
			memcpy(new_bh->b_data, header, new_bh->b_size);

			set_buffer_uptodate(new_bh);

			unlock_buffer(new_bh);

			ext2_xattr_cache_insert(ext2_mb_cache, new_bh);

			ext2_xattr_cache_insert(ea_block_cache, new_bh);

			

			ext2_xattr_update_super_block(sb);

		}
@@ -721,7 +723,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

			 */

			mb_cache_entry_delete(ext2_mb_cache, hash,

			mb_cache_entry_delete(ea_block_cache, hash,

					      old_bh->b_blocknr);

			/* Free the old block. */

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

		 * reliably detect freed block

		 */

		mb_cache_entry_delete(EXT2_SB(inode->i_sb)->s_mb_cache, hash,

		mb_cache_entry_delete(EA_BLOCK_CACHE(inode), hash,

				      bh->b_blocknr);

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

		get_bh(bh);
@@ -897,13 +899,13 @@ ext2_xattr_cache_find(struct inode *inode, struct ext2_xattr_header *header) 
{

	__u32 hash = le32_to_cpu(header->h_hash);

	struct mb_cache_entry *ce;

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

	struct mb_cache *ea_block_cache = EA_BLOCK_CACHE(inode);



	if (!header->h_hash)

		return NULL;  /* never share */

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

again:

	ce = mb_cache_entry_find_first(ext2_mb_cache, hash);

	ce = mb_cache_entry_find_first(ea_block_cache, hash);

	while (ce) {

		struct buffer_head *bh;
@@ -924,7 +926,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)) {

				mb_cache_entry_put(ext2_mb_cache, ce);

				mb_cache_entry_put(ea_block_cache, ce);

				unlock_buffer(bh);

				brelse(bh);

				goto again;
@@ -937,14 +939,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)));

				mb_cache_entry_touch(ext2_mb_cache, ce);

				mb_cache_entry_put(ext2_mb_cache, ce);

				mb_cache_entry_touch(ea_block_cache, ce);

				mb_cache_entry_put(ea_block_cache, ce);

				return bh;

			}

			unlock_buffer(bh);

			brelse(bh);

		}

		ce = mb_cache_entry_find_next(ext2_mb_cache, ce);

		ce = mb_cache_entry_find_next(ea_block_cache, ce);

	}

	return NULL;

}

fs/ext4/ext4.h

+1 −1
Original line number Diff line number Diff line
@@ -1516,7 +1516,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 mb_cache *s_mb_cache;

	struct mb_cache *s_ea_block_cache;

	spinlock_t s_es_lock ____cacheline_aligned_in_smp;



	/* Ratelimit ext4 messages. */

fs/ext4/super.c

+9 −9
Original line number Diff line number Diff line
@@ -927,9 +927,9 @@ static void ext4_put_super(struct super_block *sb) 
		invalidate_bdev(sbi->journal_bdev);

		ext4_blkdev_remove(sbi);

	}

	if (sbi->s_mb_cache) {

		ext4_xattr_destroy_cache(sbi->s_mb_cache);

		sbi->s_mb_cache = NULL;

	if (sbi->s_ea_block_cache) {

		ext4_xattr_destroy_cache(sbi->s_ea_block_cache);

		sbi->s_ea_block_cache = NULL;

	}

	if (sbi->s_mmp_tsk)

		kthread_stop(sbi->s_mmp_tsk);
@@ -4061,9 +4061,9 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
	sbi->s_journal->j_commit_callback = ext4_journal_commit_callback;



no_journal:

	sbi->s_mb_cache = ext4_xattr_create_cache();

	if (!sbi->s_mb_cache) {

		ext4_msg(sb, KERN_ERR, "Failed to create an mb_cache");

	sbi->s_ea_block_cache = ext4_xattr_create_cache();

	if (!sbi->s_ea_block_cache) {

		ext4_msg(sb, KERN_ERR, "Failed to create ea_block_cache");

		goto failed_mount_wq;

	}
@@ -4296,9 +4296,9 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
	if (EXT4_SB(sb)->rsv_conversion_wq)

		destroy_workqueue(EXT4_SB(sb)->rsv_conversion_wq);

failed_mount_wq:

	if (sbi->s_mb_cache) {

		ext4_xattr_destroy_cache(sbi->s_mb_cache);

		sbi->s_mb_cache = NULL;

	if (sbi->s_ea_block_cache) {

		ext4_xattr_destroy_cache(sbi->s_ea_block_cache);

		sbi->s_ea_block_cache = NULL;

	}

	if (sbi->s_journal) {

		jbd2_journal_destroy(sbi->s_journal);