Commit 08439fec authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Theodore Ts'o
Browse files

ext4: remove block_device_ejected 



bdi->dev now never goes away, so this function became useless.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 5f80f62a

fs/ext4/super.c

+1 −17
Original line number Diff line number Diff line
@@ -322,22 +322,6 @@ static void save_error_info(struct super_block *sb, const char *func, 
	ext4_commit_super(sb, 1);

}



/*

 * The del_gendisk() function uninitializes the disk-specific data

 * structures, including the bdi structure, without telling anyone

 * else.  Once this happens, any attempt to call mark_buffer_dirty()

 * (for example, by ext4_commit_super), will cause a kernel OOPS.

 * This is a kludge to prevent these oops until we can put in a proper

 * hook in del_gendisk() to inform the VFS and file system layers.

 */

static int block_device_ejected(struct super_block *sb)

{

	struct inode *bd_inode = sb->s_bdev->bd_inode;

	struct backing_dev_info *bdi = inode_to_bdi(bd_inode);



	return bdi->dev == NULL;

}



static void ext4_journal_commit_callback(journal_t *journal, transaction_t *txn)

{

	struct super_block		*sb = journal->j_private;
@@ -4569,7 +4553,7 @@ static int ext4_commit_super(struct super_block *sb, int sync) 
	struct buffer_head *sbh = EXT4_SB(sb)->s_sbh;

	int error = 0;



	if (!sbh || block_device_ejected(sb))

	if (!sbh)

		return error;

	if (buffer_write_io_error(sbh)) {

		/*