ext4: remove ext4_handle_release_buffer()
ext4_handle_release_buffer() was intended to remove journal write access from a buffer, but it doesn't actually do anything at all other than add a BUFFER_TRACE point, but it's not reliably used for that either. Remove all the associated dead code. Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
This commit is contained in:
parent
6d138ced75
commit
37be2f59d3
|
@ -254,13 +254,6 @@ static inline void ext4_handle_sync(handle_t *handle)
|
||||||
handle->h_sync = 1;
|
handle->h_sync = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void ext4_handle_release_buffer(handle_t *handle,
|
|
||||||
struct buffer_head *bh)
|
|
||||||
{
|
|
||||||
if (ext4_handle_valid(handle))
|
|
||||||
jbd2_journal_release_buffer(handle, bh);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline int ext4_handle_is_aborted(handle_t *handle)
|
static inline int ext4_handle_is_aborted(handle_t *handle)
|
||||||
{
|
{
|
||||||
if (ext4_handle_valid(handle))
|
if (ext4_handle_valid(handle))
|
||||||
|
|
|
@ -783,7 +783,7 @@ static int add_new_gdb(handle_t *handle, struct inode *inode,
|
||||||
|
|
||||||
err = ext4_journal_get_write_access(handle, gdb_bh);
|
err = ext4_journal_get_write_access(handle, gdb_bh);
|
||||||
if (unlikely(err))
|
if (unlikely(err))
|
||||||
goto exit_sbh;
|
goto exit_dind;
|
||||||
|
|
||||||
err = ext4_journal_get_write_access(handle, dind);
|
err = ext4_journal_get_write_access(handle, dind);
|
||||||
if (unlikely(err))
|
if (unlikely(err))
|
||||||
|
@ -792,7 +792,7 @@ static int add_new_gdb(handle_t *handle, struct inode *inode,
|
||||||
/* ext4_reserve_inode_write() gets a reference on the iloc */
|
/* ext4_reserve_inode_write() gets a reference on the iloc */
|
||||||
err = ext4_reserve_inode_write(handle, inode, &iloc);
|
err = ext4_reserve_inode_write(handle, inode, &iloc);
|
||||||
if (unlikely(err))
|
if (unlikely(err))
|
||||||
goto exit_dindj;
|
goto exit_dind;
|
||||||
|
|
||||||
n_group_desc = ext4_kvmalloc((gdb_num + 1) *
|
n_group_desc = ext4_kvmalloc((gdb_num + 1) *
|
||||||
sizeof(struct buffer_head *),
|
sizeof(struct buffer_head *),
|
||||||
|
@ -846,12 +846,7 @@ static int add_new_gdb(handle_t *handle, struct inode *inode,
|
||||||
|
|
||||||
exit_inode:
|
exit_inode:
|
||||||
ext4_kvfree(n_group_desc);
|
ext4_kvfree(n_group_desc);
|
||||||
/* ext4_handle_release_buffer(handle, iloc.bh); */
|
|
||||||
brelse(iloc.bh);
|
brelse(iloc.bh);
|
||||||
exit_dindj:
|
|
||||||
/* ext4_handle_release_buffer(handle, dind); */
|
|
||||||
exit_sbh:
|
|
||||||
/* ext4_handle_release_buffer(handle, EXT4_SB(sb)->s_sbh); */
|
|
||||||
exit_dind:
|
exit_dind:
|
||||||
brelse(dind);
|
brelse(dind);
|
||||||
exit_bh:
|
exit_bh:
|
||||||
|
@ -969,14 +964,8 @@ static int reserve_backup_gdb(handle_t *handle, struct inode *inode,
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < reserved_gdb; i++) {
|
for (i = 0; i < reserved_gdb; i++) {
|
||||||
if ((err = ext4_journal_get_write_access(handle, primary[i]))) {
|
if ((err = ext4_journal_get_write_access(handle, primary[i])))
|
||||||
/*
|
|
||||||
int j;
|
|
||||||
for (j = 0; j < i; j++)
|
|
||||||
ext4_handle_release_buffer(handle, primary[j]);
|
|
||||||
*/
|
|
||||||
goto exit_bh;
|
goto exit_bh;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((err = ext4_reserve_inode_write(handle, inode, &iloc)))
|
if ((err = ext4_reserve_inode_write(handle, inode, &iloc)))
|
||||||
|
|
|
@ -794,7 +794,6 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode,
|
||||||
int offset = (char *)s->here - bs->bh->b_data;
|
int offset = (char *)s->here - bs->bh->b_data;
|
||||||
|
|
||||||
unlock_buffer(bs->bh);
|
unlock_buffer(bs->bh);
|
||||||
ext4_handle_release_buffer(handle, bs->bh);
|
|
||||||
if (ce) {
|
if (ce) {
|
||||||
mb_cache_entry_release(ce);
|
mb_cache_entry_release(ce);
|
||||||
ce = NULL;
|
ce = NULL;
|
||||||
|
|
|
@ -60,7 +60,6 @@ EXPORT_SYMBOL(jbd2_journal_get_create_access);
|
||||||
EXPORT_SYMBOL(jbd2_journal_get_undo_access);
|
EXPORT_SYMBOL(jbd2_journal_get_undo_access);
|
||||||
EXPORT_SYMBOL(jbd2_journal_set_triggers);
|
EXPORT_SYMBOL(jbd2_journal_set_triggers);
|
||||||
EXPORT_SYMBOL(jbd2_journal_dirty_metadata);
|
EXPORT_SYMBOL(jbd2_journal_dirty_metadata);
|
||||||
EXPORT_SYMBOL(jbd2_journal_release_buffer);
|
|
||||||
EXPORT_SYMBOL(jbd2_journal_forget);
|
EXPORT_SYMBOL(jbd2_journal_forget);
|
||||||
#if 0
|
#if 0
|
||||||
EXPORT_SYMBOL(journal_sync_buffer);
|
EXPORT_SYMBOL(journal_sync_buffer);
|
||||||
|
|
|
@ -1207,17 +1207,6 @@ out:
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* jbd2_journal_release_buffer: undo a get_write_access without any buffer
|
|
||||||
* updates, if the update decided in the end that it didn't need access.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
jbd2_journal_release_buffer(handle_t *handle, struct buffer_head *bh)
|
|
||||||
{
|
|
||||||
BUFFER_TRACE(bh, "entry");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* void jbd2_journal_forget() - bforget() for potentially-journaled buffers.
|
* void jbd2_journal_forget() - bforget() for potentially-journaled buffers.
|
||||||
* @handle: transaction handle
|
* @handle: transaction handle
|
||||||
|
|
|
@ -1096,7 +1096,6 @@ extern int jbd2_journal_get_undo_access(handle_t *, struct buffer_head *);
|
||||||
void jbd2_journal_set_triggers(struct buffer_head *,
|
void jbd2_journal_set_triggers(struct buffer_head *,
|
||||||
struct jbd2_buffer_trigger_type *type);
|
struct jbd2_buffer_trigger_type *type);
|
||||||
extern int jbd2_journal_dirty_metadata (handle_t *, struct buffer_head *);
|
extern int jbd2_journal_dirty_metadata (handle_t *, struct buffer_head *);
|
||||||
extern void jbd2_journal_release_buffer (handle_t *, struct buffer_head *);
|
|
||||||
extern int jbd2_journal_forget (handle_t *, struct buffer_head *);
|
extern int jbd2_journal_forget (handle_t *, struct buffer_head *);
|
||||||
extern void journal_sync_buffer (struct buffer_head *);
|
extern void journal_sync_buffer (struct buffer_head *);
|
||||||
extern void jbd2_journal_invalidatepage(journal_t *,
|
extern void jbd2_journal_invalidatepage(journal_t *,
|
||||||
|
|
Loading…
Reference in New Issue