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>

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>
Eric Sandeen · Theodore Ts'o
1 parent 6d138ced75
Showing 6 changed files with 3 additions and 35 deletions Side-by-side Diff
fs/ext4/ext4_jbd2.h
fs/ext4/resize.c
fs/ext4/xattr.c
fs/jbd2/journal.c
fs/jbd2/transaction.c
include/linux/jbd2.h
@@ -254,13 +254,6 @@
 		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)
 {
 	if (ext4_handle_valid(handle))
@@ -783,7 +783,7 @@
  
 	err = ext4_journal_get_write_access(handle, gdb_bh);
 	if (unlikely(err))
-		goto exit_sbh;
+		goto exit_dind;
  
 	err = ext4_journal_get_write_access(handle, dind);
 	if (unlikely(err))
@@ -792,7 +792,7 @@
 	/* ext4_reserve_inode_write() gets a reference on the iloc */
 	err = ext4_reserve_inode_write(handle, inode, &iloc);
 	if (unlikely(err))
-		goto exit_dindj;
+		goto exit_dind;
  
 	n_group_desc = ext4_kvmalloc((gdb_num + 1) *
 				     sizeof(struct buffer_head *),
  
@@ -846,12 +846,7 @@
  
 exit_inode:
 	ext4_kvfree(n_group_desc);
-	/* ext4_handle_release_buffer(handle, 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:
 	brelse(dind);
 exit_bh:
  
@@ -969,14 +964,8 @@
 	}
  
 	for (i = 0; i < reserved_gdb; 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]);
-			 */
+		if ((err = ext4_journal_get_write_access(handle, primary[i])))
 			goto exit_bh;
-		}
 	}
  
 	if ((err = ext4_reserve_inode_write(handle, inode, &iloc)))
@@ -794,7 +794,6 @@
 			int offset = (char *)s->here - bs->bh->b_data;
  
 			unlock_buffer(bs->bh);
-			ext4_handle_release_buffer(handle, bs->bh);
 			if (ce) {
 				mb_cache_entry_release(ce);
 				ce = NULL;
@@ -60,7 +60,6 @@
 EXPORT_SYMBOL(jbd2_journal_get_undo_access);
 EXPORT_SYMBOL(jbd2_journal_set_triggers);
 EXPORT_SYMBOL(jbd2_journal_dirty_metadata);
-EXPORT_SYMBOL(jbd2_journal_release_buffer);
 EXPORT_SYMBOL(jbd2_journal_forget);
 #if 0
 EXPORT_SYMBOL(journal_sync_buffer);
@@ -1207,17 +1207,6 @@
 	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.
  * @handle: transaction handle
@@ -1096,7 +1096,6 @@
 void		 jbd2_journal_set_triggers(struct buffer_head *,
 					   struct jbd2_buffer_trigger_type *type);
 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 void	 journal_sync_buffer (struct buffer_head *);
 extern void	 jbd2_journal_invalidatepage(journal_t *,
...	...	@@ -254,13 +254,6 @@
254	254	handle->h_sync = 1;
255	255	}
256	256
257		-static inline void ext4_handle_release_buffer(handle_t *handle,
258		- struct buffer_head *bh)
259		-{
260		- if (ext4_handle_valid(handle))
261		- jbd2_journal_release_buffer(handle, bh);
262		-}
263		-
264	257	static inline int ext4_handle_is_aborted(handle_t *handle)
265	258	{
266	259	if (ext4_handle_valid(handle))
...	...	@@ -783,7 +783,7 @@
783	783
784	784	err = ext4_journal_get_write_access(handle, gdb_bh);
785	785	if (unlikely(err))
786		- goto exit_sbh;
	786	+ goto exit_dind;
787	787
788	788	err = ext4_journal_get_write_access(handle, dind);
789	789	if (unlikely(err))
...	...	@@ -792,7 +792,7 @@
792	792	/* ext4_reserve_inode_write() gets a reference on the iloc */
793	793	err = ext4_reserve_inode_write(handle, inode, &iloc);
794	794	if (unlikely(err))
795		- goto exit_dindj;
	795	+ goto exit_dind;
796	796
797	797	n_group_desc = ext4_kvmalloc((gdb_num + 1) *
798	798	sizeof(struct buffer_head *),
799	799
...	...	@@ -846,12 +846,7 @@
846	846
847	847	exit_inode:
848	848	ext4_kvfree(n_group_desc);
849		- /* ext4_handle_release_buffer(handle, iloc.bh); */
850	849	brelse(iloc.bh);
851		-exit_dindj:
852		- /* ext4_handle_release_buffer(handle, dind); */
853		-exit_sbh:
854		- /* ext4_handle_release_buffer(handle, EXT4_SB(sb)->s_sbh); */
855	850	exit_dind:
856	851	brelse(dind);
857	852	exit_bh:
858	853
...	...	@@ -969,14 +964,8 @@
969	964	}
970	965
971	966	for (i = 0; i < reserved_gdb; i++) {
972		- if ((err = ext4_journal_get_write_access(handle, primary[i]))) {
973		- /*
974		- int j;
975		- for (j = 0; j < i; j++)
976		- ext4_handle_release_buffer(handle, primary[j]);
977		- */
	967	+ if ((err = ext4_journal_get_write_access(handle, primary[i])))
978	968	goto exit_bh;
979		- }
980	969	}
981	970
982	971	if ((err = ext4_reserve_inode_write(handle, inode, &iloc)))
...	...	@@ -794,7 +794,6 @@
794	794	int offset = (char *)s->here - bs->bh->b_data;
795	795
796	796	unlock_buffer(bs->bh);
797		- ext4_handle_release_buffer(handle, bs->bh);
798	797	if (ce) {
799	798	mb_cache_entry_release(ce);
800	799	ce = NULL;
...	...	@@ -60,7 +60,6 @@
60	60	EXPORT_SYMBOL(jbd2_journal_get_undo_access);
61	61	EXPORT_SYMBOL(jbd2_journal_set_triggers);
62	62	EXPORT_SYMBOL(jbd2_journal_dirty_metadata);
63		-EXPORT_SYMBOL(jbd2_journal_release_buffer);
64	63	EXPORT_SYMBOL(jbd2_journal_forget);
65	64	#if 0
66	65	EXPORT_SYMBOL(journal_sync_buffer);
...	...	@@ -1207,17 +1207,6 @@
1207	1207	return ret;
1208	1208	}
1209	1209
1210		-/*
1211		- * jbd2_journal_release_buffer: undo a get_write_access without any buffer
1212		- * updates, if the update decided in the end that it didn't need access.
1213		- *
1214		- */
1215		-void
1216		-jbd2_journal_release_buffer(handle_t handle, struct buffer_head bh)
1217		-{
1218		- BUFFER_TRACE(bh, "entry");
1219		-}
1220		-
1221	1210	/**
1222	1211	* void jbd2_journal_forget() - bforget() for potentially-journaled buffers.
1223	1212	* @handle: transaction handle
...	...	@@ -1096,7 +1096,6 @@
1096	1096	void jbd2_journal_set_triggers(struct buffer_head *,
1097	1097	struct jbd2_buffer_trigger_type *type);
1098	1098	extern int jbd2_journal_dirty_metadata (handle_t , struct buffer_head );
1099		-extern void jbd2_journal_release_buffer (handle_t , struct buffer_head );
1100	1099	extern int jbd2_journal_forget (handle_t , struct buffer_head );
1101	1100	extern void journal_sync_buffer (struct buffer_head *);
1102	1101	extern void jbd2_journal_invalidatepage(journal_t *,