Commit e4684b3f authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

ext4: fold ext4_journal_revoke() into ext4_forget() 



The only caller of ext4_journal_revoke() is ext4_forget(), so we can
fold ext4_journal_revoke() into ext4_forget() to simplify the code and
shorten the call stack.

Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent d6797d14

fs/ext4/ext4_jbd2.c

+11 −19
Original line number Diff line number Diff line
@@ -50,22 +50,6 @@ int __ext4_journal_forget(const char *where, handle_t *handle, 
	return err;

}



int __ext4_journal_revoke(const char *where, handle_t *handle,

				ext4_fsblk_t blocknr, struct buffer_head *bh)

{

	int err = 0;



	if (ext4_handle_valid(handle)) {

		err = jbd2_journal_revoke(handle, blocknr, bh);

		if (err)

			ext4_journal_abort_handle(where, __func__, bh,

						  handle, err);

	}

	else

		bforget(bh);

	return err;

}



/*

 * The ext4 forget function must perform a revoke if we are freeing data

 * which has been journaled.  Metadata (eg. indirect blocks) must be
@@ -94,6 +78,12 @@ int __ext4_forget(const char *where, handle_t *handle, int is_metadata, 
		  bh, is_metadata, inode->i_mode,

		  test_opt(inode->i_sb, DATA_FLAGS));



	/* In the no journal case, we can just do a bforget and return */

	if (!ext4_handle_valid(handle)) {

		bforget(bh);

		return 0;

	}



	/* Never use the revoke function if we are doing full data

	 * journaling: there is no need to, and a V1 superblock won't

	 * support it.  Otherwise, only skip the revoke on un-journaled
@@ -111,11 +101,13 @@ int __ext4_forget(const char *where, handle_t *handle, int is_metadata, 
	/*

	 * data!=journal && (is_metadata || should_journal_data(inode))

	 */

	BUFFER_TRACE(bh, "call ext4_journal_revoke");

	err = __ext4_journal_revoke(where, handle, blocknr, bh);

	if (err)

	BUFFER_TRACE(bh, "call jbd2_journal_revoke");

	err = jbd2_journal_revoke(handle, blocknr, bh);

	if (err) {

		ext4_journal_abort_handle(where, __func__, bh, handle, err);

		ext4_abort(inode->i_sb, __func__,

			   "error %d when attempting revoke", err);

	}

	BUFFER_TRACE(bh, "exit");

	return err;

}

fs/ext4/ext4_jbd2.h

+1 −11
Original line number Diff line number Diff line
@@ -116,12 +116,8 @@ int ext4_reserve_inode_write(handle_t *handle, struct inode *inode, 
int ext4_mark_inode_dirty(handle_t *handle, struct inode *inode);



/*

 * Wrapper functions with which ext4 calls into JBD.  The intent here is

 * to allow these to be turned into appropriate stubs so ext4 can control

 * ext2 filesystems, so ext2+ext4 systems only nee one fs.  This work hasn't

 * been done yet.

 * Wrapper functions with which ext4 calls into JBD.

 */



void ext4_journal_abort_handle(const char *caller, const char *err_fn,

		struct buffer_head *bh, handle_t *handle, int err);
@@ -135,10 +131,6 @@ int __ext4_journal_get_write_access(const char *where, handle_t *handle, 
int __ext4_journal_forget(const char *where, handle_t *handle,

				struct buffer_head *bh);



/* When called with an invalid handle, this will still do a put on the BH */

int __ext4_journal_revoke(const char *where, handle_t *handle,

				ext4_fsblk_t blocknr, struct buffer_head *bh);



int __ext4_forget(const char *where, handle_t *handle, int is_metadata,

		  struct inode *inode, struct buffer_head *bh,

		  ext4_fsblk_t blocknr);
@@ -153,8 +145,6 @@ int __ext4_handle_dirty_metadata(const char *where, handle_t *handle, 
	__ext4_journal_get_undo_access(__func__, (handle), (bh))

#define ext4_journal_get_write_access(handle, bh) \

	__ext4_journal_get_write_access(__func__, (handle), (bh))

#define ext4_journal_revoke(handle, blocknr, bh) \

	__ext4_journal_revoke(__func__, (handle), (blocknr), (bh))

#define ext4_forget(handle, is_metadata, inode, bh, block_nr) \

	__ext4_forget(__func__, (handle), (is_metadata), (inode), (bh),\

		      (block_nr))