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

Commit 537a0310 authored by Amir Goldstein's avatar Amir Goldstein Committed by Theodore Ts'o
Browse files

ext4: unify the ext4_handle_release_buffer() api 



There are two wrapper functions which do exactly the same thing:
ext4_journal_release_buffer(), and ext4_handle_release_buffer().  In
addition, ext4_xattr_block_set() calls jbd2_journal_release_buffer()
directly.

Unify all of the code to use ext4_handle_release_buffer(), and get rid
of ext4_journal_release_buffer().

Signed-off-by: default avatarAmir Goldstein <amir73il@users.sf.net>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent ef607893

fs/ext4/ext4_jbd2.h

+0 −7
Original line number Diff line number Diff line
@@ -202,13 +202,6 @@ static inline int ext4_handle_has_enough_credits(handle_t *handle, int needed) 
	return 1;

}



static inline void ext4_journal_release_buffer(handle_t *handle,

						struct buffer_head *bh)

{

	if (ext4_handle_valid(handle))

		jbd2_journal_release_buffer(handle, bh);

}



static inline handle_t *ext4_journal_start(struct inode *inode, int nblocks)

{

	return ext4_journal_start_sb(inode->i_sb, nblocks);

fs/ext4/resize.c

+4 −4
Original line number Diff line number Diff line
@@ -499,12 +499,12 @@ static int add_new_gdb(handle_t *handle, struct inode *inode, 
	return err;



exit_inode:

	/* ext4_journal_release_buffer(handle, iloc.bh); */

	/* ext4_handle_release_buffer(handle, iloc.bh); */

	brelse(iloc.bh);

exit_dindj:

	/* ext4_journal_release_buffer(handle, dind); */

	/* ext4_handle_release_buffer(handle, dind); */

exit_sbh:

	/* ext4_journal_release_buffer(handle, EXT4_SB(sb)->s_sbh); */

	/* ext4_handle_release_buffer(handle, EXT4_SB(sb)->s_sbh); */

exit_dind:

	brelse(dind);

exit_bh:
@@ -586,7 +586,7 @@ static int reserve_backup_gdb(handle_t *handle, struct inode *inode, 
			/*

			int j;

			for (j = 0; j < i; j++)

				ext4_journal_release_buffer(handle, primary[j]);

				ext4_handle_release_buffer(handle, primary[j]);

			 */

			goto exit_bh;

		}

fs/ext4/xattr.c

+1 −1
Original line number Diff line number Diff line
@@ -735,7 +735,7 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode, 
			int offset = (char *)s->here - bs->bh->b_data;



			unlock_buffer(bs->bh);

			jbd2_journal_release_buffer(handle, bs->bh);

			ext4_handle_release_buffer(handle, bs->bh);

			if (ce) {

				mb_cache_entry_release(ce);

				ce = NULL;